Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 365401703d382861e86072d2813c2eacae56000f)
| ... | ... |
@@ -10,6 +10,7 @@ import ( |
| 10 | 10 |
"os/exec" |
| 11 | 11 |
"path/filepath" |
| 12 | 12 |
"strconv" |
| 13 |
+ "strings" |
|
| 13 | 14 |
"sync" |
| 14 | 15 |
"syscall" |
| 15 | 16 |
"time" |
| ... | ... |
@@ -351,11 +352,19 @@ func (r *remote) runContainerdDaemon() error {
|
| 351 | 351 |
} |
| 352 | 352 |
logrus.Debugf("runContainerdDaemon: runtimeArgs: %s", args)
|
| 353 | 353 |
} |
| 354 |
+ |
|
| 354 | 355 |
cmd := exec.Command(containerdBinary, args...) |
| 355 | 356 |
// redirect containerd logs to docker logs |
| 356 | 357 |
cmd.Stdout = os.Stdout |
| 357 | 358 |
cmd.Stderr = os.Stderr |
| 358 | 359 |
cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
|
| 360 |
+ cmd.Env = nil |
|
| 361 |
+ // clear the NOTIFY_SOCKET from the env when starting containerd |
|
| 362 |
+ for _, e := range os.Environ() {
|
|
| 363 |
+ if !strings.HasPrefix(e, "NOTIFY_SOCKET") {
|
|
| 364 |
+ cmd.Env = append(cmd.Env, e) |
|
| 365 |
+ } |
|
| 366 |
+ } |
|
| 359 | 367 |
if err := cmd.Start(); err != nil {
|
| 360 | 368 |
return err |
| 361 | 369 |
} |