Set Pdeathsig for containerd on SIGKILL
Makes sure containerd exits (when started by docker) if docker gets SIGKILL'd. Signed-off-by: Brian Goff <cpuguy83@gmail.com> Upstream-commit: d4559313d5b0284bf2544d83e6431873c06f8349 Component: engine
This commit is contained in:
@@ -357,7 +357,7 @@ func (r *remote) runContainerdDaemon() error {
|
||||
// redirect containerd logs to docker logs
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
|
||||
cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true, Pdeathsig: syscall.SIGKILL}
|
||||
cmd.Env = nil
|
||||
// clear the NOTIFY_SOCKET from the env when starting containerd
|
||||
for _, e := range os.Environ() {
|
||||
|
||||
Reference in New Issue
Block a user