Its useful to have containerd logs as part of docker.
Containerd metrics are too chatty, so set interval to 0.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit d9c3b653c0776bdfc4af9129ebbf41160a793cf3)
| ... | ... |
@@ -342,7 +342,7 @@ func (r *remote) runContainerdDaemon() error {
|
| 342 | 342 |
// Start a new instance |
| 343 | 343 |
args := []string{"-l", r.rpcAddr, "--runtime", "docker-runc"}
|
| 344 | 344 |
if r.debugLog {
|
| 345 |
- args = append(args, "--debug") |
|
| 345 |
+ args = append(args, "--debug", "--metrics-interval=0") |
|
| 346 | 346 |
} |
| 347 | 347 |
if len(r.runtimeArgs) > 0 {
|
| 348 | 348 |
for _, v := range r.runtimeArgs {
|
| ... | ... |
@@ -352,7 +352,9 @@ func (r *remote) runContainerdDaemon() error {
|
| 352 | 352 |
logrus.Debugf("runContainerdDaemon: runtimeArgs: %s", args)
|
| 353 | 353 |
} |
| 354 | 354 |
cmd := exec.Command(containerdBinary, args...) |
| 355 |
- // TODO: store logs? |
|
| 355 |
+ // redirect containerd logs to docker logs |
|
| 356 |
+ cmd.Stdout = os.Stdout |
|
| 357 |
+ cmd.Stderr = os.Stderr |
|
| 356 | 358 |
cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
|
| 357 | 359 |
if err := cmd.Start(); err != nil {
|
| 358 | 360 |
return err |