mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Allow specifying the docker client path in _DOCKER_INIT_PATH
I currently need this to get the tests running, otherwise it will mount the docker.test binary inside the containers, which doesn't work due to the libdevmapper.so dependency.
This commit is contained in:
parent
6094257b28
commit
76a2ab6e34
1 changed files with 14 additions and 9 deletions
|
@ -52,6 +52,10 @@ type Runtime struct {
|
||||||
var sysInitPath string
|
var sysInitPath string
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
env := os.Getenv("_DOCKER_INIT_PATH")
|
||||||
|
if env != "" {
|
||||||
|
sysInitPath = env
|
||||||
|
} else {
|
||||||
selfPath := utils.SelfPath()
|
selfPath := utils.SelfPath()
|
||||||
|
|
||||||
// If we have a separate docker-init, use that, otherwise use the
|
// If we have a separate docker-init, use that, otherwise use the
|
||||||
|
@ -63,6 +67,7 @@ func init() {
|
||||||
} else {
|
} else {
|
||||||
sysInitPath = dockerInitPath
|
sysInitPath = dockerInitPath
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// List returns an array of all containers registered in the runtime.
|
// List returns an array of all containers registered in the runtime.
|
||||||
|
|
Loading…
Add table
Reference in a new issue