Merge pull request #21599 from tonistiigi/separate-daemon-exec-root

Use separate exec-root for test daemons
Upstream-commit: d33480474f33523743ae49c1b96737fbfbeb1a6f
Component: engine
This commit is contained in:
Alexander Morozov
2016-03-29 07:52:18 -07:00
2 changed files with 2 additions and 1 deletions

View File

@ -144,6 +144,7 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {
d.Command,
"--containerd", "/var/run/docker/libcontainerd/docker-containerd.sock",
"--graph", d.root,
"--exec-root", filepath.Join(d.folder, "exec-root"),
"--pidfile", fmt.Sprintf("%s/docker.pid", d.folder),
fmt.Sprintf("--userland-proxy=%t", d.userlandProxy),
)