Browse code

Merge pull request #22046 from cpuguy83/containerd_stdio

Set containerd pdeathsig

Sebastiaan van Stijn authored on 2016/05/06 16:26:16
Showing 1 changed files
... ...
@@ -365,7 +365,7 @@ func (r *remote) runContainerdDaemon() error {
365 365
 	// redirect containerd logs to docker logs
366 366
 	cmd.Stdout = os.Stdout
367 367
 	cmd.Stderr = os.Stderr
368
-	cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
368
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true, Pdeathsig: syscall.SIGKILL}
369 369
 	cmd.Env = nil
370 370
 	// clear the NOTIFY_SOCKET from the env when starting containerd
371 371
 	for _, e := range os.Environ() {