docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Alexander Larsson 2013-09-10 21:04:25 +02:00 committed by Victor Vieux
parent bc7fa7b957
commit 6938a36c69
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime.go
View File

@ -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.