kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Make privateRegistryURL (and dockerd) constant

Browse source 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2016-12-19 12:43:08 +01:00
parent ba1c20f8d6
commit be88dd1032
No known key found for this signature in database
GPG key ID: 083CC6FD6EB699A3
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
integration-cli/docker_test_vars.go
View file

@ -13,18 +13,21 @@ import (
"github.com/docker/docker/pkg/reexec" "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 ( var (
// the docker client binary to use // the docker client binary to use
dockerBinary = "docker" dockerBinary = "docker"
// the docker daemon binary to use
dockerdBinary = "dockerd"
// path to containerd's ctr binary // path to containerd's ctr binary
ctrBinary = "docker-containerd-ctr" 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 // isLocalDaemon is true if the daemon under test is on the same
// host as the CLI. // host as the CLI.
isLocalDaemon bool isLocalDaemon bool
@ -81,9 +84,6 @@ func init() {
fmt.Printf("ERROR: couldn't resolve full path to the Docker binary (%v)\n", err) fmt.Printf("ERROR: couldn't resolve full path to the Docker binary (%v)\n", err)
os.Exit(1) os.Exit(1)
} }
if registry := os.Getenv("REGISTRY_URL"); registry != "" {
privateRegistryURL = registry
}
// Deterministically working out the environment in which CI is running // Deterministically working out the environment in which CI is running
// to evaluate whether the daemon is local or remote is not possible through // to evaluate whether the daemon is local or remote is not possible through