1. docker
  2. Commit 6889c3276c6895a8440dc8883b8cd608793199f3
Browse code

Fix containerd proto for connection

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Michael Crosby authored on 2016/05/10 07:17:10
Showing 3 changed files
integration-cli/docker_cli_daemon_experimental_test.go
History View file @ 6889c32
... ... 
@@ -33,7 +33,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithKilledRunningContainer(t *check
33 33 
 	}
34 34
35 35 
 	// kill the container
36 
-	runCmd := exec.Command(ctrBinary, "--address", "/var/run/docker/libcontainerd/docker-containerd.sock", "containers", "kill", cid)
36 
+	runCmd := exec.Command(ctrBinary, "--address", "unix:///var/run/docker/libcontainerd/docker-containerd.sock", "containers", "kill", cid)
37 37 
 	if out, ec, err := runCommandWithOutput(runCmd); err != nil {
38 38 
 		t.Fatalf("Failed to run ctr, ExitCode: %d, err: '%v' output: '%s' cid: '%s'\n", ec, err, out, cid)
39 39 
 	}
... ... 
@@ -120,7 +120,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPausedRunningContainer(t *check
120 120 
 	}
121 121
122 122 
 	// kill the container
123 
-	runCmd := exec.Command(ctrBinary, "--address", "/var/run/docker/libcontainerd/docker-containerd.sock", "containers", "pause", cid)
123 
+	runCmd := exec.Command(ctrBinary, "--address", "unix:///var/run/docker/libcontainerd/docker-containerd.sock", "containers", "pause", cid)
124 124 
 	if out, ec, err := runCommandWithOutput(runCmd); err != nil {
125 125 
 		t.Fatalf("Failed to run ctr, ExitCode: %d, err: '%v' output: '%s' cid: '%s'\n", ec, err, out, cid)
126 126 
 	}
... ... 
@@ -170,7 +170,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithUnpausedRunningContainer(t *che
170 170 
 	}
171 171
172 172 
 	// resume the container
173 
-	runCmd := exec.Command(ctrBinary, "--address", "/var/run/docker/libcontainerd/docker-containerd.sock", "containers", "resume", cid)
173 
+	runCmd := exec.Command(ctrBinary, "--address", "unix:///var/run/docker/libcontainerd/docker-containerd.sock", "containers", "resume", cid)
174 174 
 	if out, ec, err := runCommandWithOutput(runCmd); err != nil {
175 175 
 		t.Fatalf("Failed to run ctr, ExitCode: %d, err: '%v' output: '%s' cid: '%s'\n", ec, err, out, cid)
176 176 
 	}
integration-cli/docker_cli_daemon_test.go
History View file @ 6889c32
... ... 
@@ -1550,7 +1550,7 @@ func (s *DockerDaemonSuite) TestCleanupMountsAfterDaemonAndContainerKill(c *chec
1550 1550 
 	c.Assert(strings.Contains(string(mountOut), id), check.Equals, true, comment)
1551 1551
1552 1552 
 	// kill the container
1553 
-	runCmd := exec.Command(ctrBinary, "--address", "/var/run/docker/libcontainerd/docker-containerd.sock", "containers", "kill", id)
1553 
+	runCmd := exec.Command(ctrBinary, "--address", "unix:///var/run/docker/libcontainerd/docker-containerd.sock", "containers", "kill", id)
1554 1554 
 	if out, ec, err := runCommandWithOutput(runCmd); err != nil {
1555 1555 
 		c.Fatalf("Failed to run ctr, ExitCode: %d, err: %v output: %s id: %s\n", ec, err, out, id)
1556 1556 
 	}
libcontainerd/remote_linux.go
History View file @ 6889c32
... ... 
@@ -349,7 +349,12 @@ func (r *remote) runContainerdDaemon() error {
349 349 
 	}
350 350
351 351 
 	// Start a new instance
352 
-	args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc", "--metrics-interval=0"}
352 
+	args := []string{
353 
+		"-l", fmt.Sprintf("unix://%s", r.rpcAddr),
354 
+		"--shim", "docker-containerd-shim",
355 
+		"--runtime", "docker-runc",
356 
+		"--metrics-interval=0",
357 
+	}
353 358 
 	if r.debugLog {
354 359 
 		args = append(args, "--debug")
355 360 
 	}