1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #22046 from cpuguy83/containerd_stdio

Set containerd pdeathsig
This commit is contained in:
Sebastiaan van Stijn 2016-05-06 09:26:16 +02:00
commit 9a9ebc7f85

View file

@ -365,7 +365,7 @@ func (r *remote) runContainerdDaemon() error {
// redirect containerd logs to docker logs // redirect containerd logs to docker logs
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true} cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true, Pdeathsig: syscall.SIGKILL}
cmd.Env = nil cmd.Env = nil
// clear the NOTIFY_SOCKET from the env when starting containerd // clear the NOTIFY_SOCKET from the env when starting containerd
for _, e := range os.Environ() { for _, e := range os.Environ() {