Browse code
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>
Brian Goff authored on 2016/05/03 03:23:38Showing 1 changed files
| ... | ... |
@@ -357,7 +357,7 @@ func (r *remote) runContainerdDaemon() error {
|
| 357 | 357 |
// redirect containerd logs to docker logs |
| 358 | 358 |
cmd.Stdout = os.Stdout |
| 359 | 359 |
cmd.Stderr = os.Stderr |
| 360 |
- cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
|
|
| 360 |
+ cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true, Pdeathsig: syscall.SIGKILL}
|
|
| 361 | 361 |
cmd.Env = nil |
| 362 | 362 |
// clear the NOTIFY_SOCKET from the env when starting containerd |
| 363 | 363 |
for _, e := range os.Environ() {
|