From 1e788ec9855058913de6ac8a2be7acee0f001954 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Tue, 24 Mar 2015 10:47:30 -0700 Subject: [PATCH] Use /var/run/docker as root for execdriver Signed-off-by: Alexander Morozov --- daemon/daemon.go | 3 ++- daemon/execdriver/native/driver.go | 1 - integration-cli/docker_test_vars.go | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index 6a27a085a0..453e2e0271 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -1012,7 +1012,8 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error) } sysInfo := sysinfo.New(false) - ed, err := execdrivers.NewDriver(config.ExecDriver, config.Root, sysInitPath, sysInfo) + const runDir = "/var/run/docker" + ed, err := execdrivers.NewDriver(config.ExecDriver, runDir, sysInitPath, sysInfo) if err != nil { return nil, err } diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go index 99019d0f8e..46097a8cc5 100644 --- a/daemon/execdriver/native/driver.go +++ b/daemon/execdriver/native/driver.go @@ -64,7 +64,6 @@ func NewDriver(root, initPath string) (*driver, error) { root, cgm, libcontainer.InitPath(reexec.Self(), DriverName), - libcontainer.TmpfsRoot, ) if err != nil { return nil, err diff --git a/integration-cli/docker_test_vars.go b/integration-cli/docker_test_vars.go index ff2ec74063..9cb28b274e 100644 --- a/integration-cli/docker_test_vars.go +++ b/integration-cli/docker_test_vars.go @@ -17,11 +17,13 @@ var ( privateRegistryURL = "127.0.0.1:5000" dockerBasePath = "/var/lib/docker" - execDriverPath = dockerBasePath + "/execdriver/native" volumesConfigPath = dockerBasePath + "/volumes" volumesStoragePath = dockerBasePath + "/vfs/dir" containerStoragePath = dockerBasePath + "/containers" + runtimePath = "/var/run/docker" + execDriverPath = runtimePath + "/execdriver/native" + workingDirectory string )