upstream/terraform-provider-docker
1
0
Fork 0
mirror of https://github.com/kreuzwerker/terraform-provider-docker.git synced 2026-02-16 09:08:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing build and private image

Browse source
This commit is contained in:
Manuel Vogel 2018-04-10 08:47:28 +02:00
parent 9e643ac13d
commit c8c1f9e662
No known key found for this signature in database
GPG key ID: 533006C7B61DB1CE
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docker/provider_test.go
View file

@ -35,6 +35,14 @@ func testAccPreCheck(t *testing.T) {
t.Fatalf("Docker must be available: %s", err)
}
cmd = exec.Command("docker", "node", "ls")
if err := cmd.Run(); err != nil {
cmd = exec.Command("docker", "swarm", "init")
if err := cmd.Run(); err != nil {
t.Fatalf("Docker swarm could not be initialized: %s", err)
}
}
if v := os.Getenv("DOCKER_REGISTRY_ADDRESS"); v == "" {
t.Fatalf("DOCKER_REGISTRY_ADDRESS must be set for acceptance tests")
}

2
scripts/runAccTests.sh
View file

@ -12,7 +12,7 @@ setup() {
export DOCKER_REGISTRY_ADDRESS="127.0.0.1:15000"
export DOCKER_REGISTRY_USER="testuser"
export DOCKER_REGISTRY_PASS="testpwd"
export DOCKER_PRIVATE_IMAGE="127.0.0.1:15000/my-private-service:v1"
export DOCKER_PRIVATE_IMAGE="127.0.0.1:15000/tftest-service:v1"
sh "$(pwd)"/scripts/testing/setup_private_registry.sh
}