Merge pull request #29536 from vdemeester/integration-privateRegistryURL-const

[test-integration] Make privateRegistryURL (and dockerd) constant

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