From c8c1f9e66270f7882caa9172045f4c44eeb3487c Mon Sep 17 00:00:00 2001 From: Manuel Vogel Date: Tue, 10 Apr 2018 08:47:28 +0200 Subject: [PATCH] Fixing build and private image --- docker/provider_test.go | 8 ++++++++ scripts/runAccTests.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docker/provider_test.go b/docker/provider_test.go index 7d6396be..3ac7c614 100644 --- a/docker/provider_test.go +++ b/docker/provider_test.go @@ -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") } diff --git a/scripts/runAccTests.sh b/scripts/runAccTests.sh index 08a88f05..a146f369 100755 --- a/scripts/runAccTests.sh +++ b/scripts/runAccTests.sh @@ -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 }