Merge pull request #22046 from cpuguy83/containerd_stdio
Set containerd pdeathsig
This commit is contained in:
commit
9a9ebc7f85
|
@ -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() {
|
||||||
|
|
Loading…
Reference in New Issue