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

Merge pull request #11716 from LK4D4/root_in_run

Browse source 
Use /var/run/docker as root for execdriver
This commit is contained in:
Michael Crosby 2015-03-24 14:58:30 -07:00
commit f3fc857e01
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/daemon.go
View file

@ -1012,7 +1012,8 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
} }
sysInfo := sysinfo.New(false) 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 { if err != nil {
return nil, err return nil, err
} }

1
daemon/execdriver/native/driver.go
View file

@ -64,7 +64,6 @@ func NewDriver(root, initPath string) (*driver, error) {
root, root,
cgm, cgm,
libcontainer.InitPath(reexec.Self(), DriverName), libcontainer.InitPath(reexec.Self(), DriverName),
libcontainer.TmpfsRoot,
) )
if err != nil { if err != nil {
return nil, err return nil, err

4
integration-cli/docker_test_vars.go
View file

@ -17,11 +17,13 @@ var (
privateRegistryURL = "127.0.0.1:5000" privateRegistryURL = "127.0.0.1:5000"
dockerBasePath = "/var/lib/docker" dockerBasePath = "/var/lib/docker"
execDriverPath = dockerBasePath + "/execdriver/native"
volumesConfigPath = dockerBasePath + "/volumes" volumesConfigPath = dockerBasePath + "/volumes"
volumesStoragePath = dockerBasePath + "/vfs/dir" volumesStoragePath = dockerBasePath + "/vfs/dir"
containerStoragePath = dockerBasePath + "/containers" containerStoragePath = dockerBasePath + "/containers"
runtimePath = "/var/run/docker"
execDriverPath = runtimePath + "/execdriver/native"
workingDirectory string workingDirectory string
) )