From 2d06f72bfb84b67ff1846ee07735683a75cbd017 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 19 Dec 2016 12:43:08 +0100 Subject: [PATCH] Make privateRegistryURL (and dockerd) constant Signed-off-by: Vincent Demeester Upstream-commit: be88dd10324d8ecaa13170703c6e250b1c69fe73 Component: engine --- .../engine/integration-cli/docker_test_vars.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/components/engine/integration-cli/docker_test_vars.go b/components/engine/integration-cli/docker_test_vars.go index a3cdf54ae4..187d0c0f58 100644 --- a/components/engine/integration-cli/docker_test_vars.go +++ b/components/engine/integration-cli/docker_test_vars.go @@ -13,18 +13,21 @@ import ( "github.com/docker/docker/pkg/reexec" ) +const ( + // the private registry to use for tests + privateRegistryURL = "127.0.0.1:5000" + + // the docker daemon binary to use + dockerdBinary = "dockerd" +) + var ( // the docker client binary to use dockerBinary = "docker" - // the docker daemon binary to use - dockerdBinary = "dockerd" // path to containerd's ctr binary ctrBinary = "docker-containerd-ctr" - // the private registry to use for tests - privateRegistryURL = "127.0.0.1:5000" - // isLocalDaemon is true if the daemon under test is on the same // host as the CLI. isLocalDaemon bool @@ -81,9 +84,6 @@ func init() { fmt.Printf("ERROR: couldn't resolve full path to the Docker binary (%v)\n", err) os.Exit(1) } - if registry := os.Getenv("REGISTRY_URL"); registry != "" { - privateRegistryURL = registry - } // Deterministically working out the environment in which CI is running // to evaluate whether the daemon is local or remote is not possible through