toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add docker- prefix to runc and containerd binaries

Browse Source 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 009399dc8ed8a4b635b0e229bf07b685e286d8d9
Component: engine
This commit is contained in:
Tibor Vass
2016-03-22 20:55:47 -04:00
parent 7c90f8b43b
commit ce07920e99
17 changed files with 333 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/integration-cli/daemon.go
View File

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