瀏覽代碼

daemon/start: Revert passing ctx to ctr.Start

This caused integration tests to timeout in the CI

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Paweł Gronowski 2 年之前
父節點
當前提交
a181a825c8
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      daemon/start.go

+ 2 - 2
daemon/start.go

@@ -183,8 +183,8 @@ func (daemon *Daemon) containerStart(ctx context.Context, container *container.C
 	}
 
 	// TODO(mlaventure): we need to specify checkpoint options here
-	tsk, err := ctr.Start(ctx, checkpointDir,
-		container.StreamConfig.Stdin() != nil || container.Config.Tty,
+	tsk, err := ctr.Start(context.TODO(), // Passing ctx to ctr.Start caused integration tests to be stuck in the cleanup phase
+		checkpointDir, container.StreamConfig.Stdin() != nil || container.Config.Tty,
 		container.InitializeStdio)
 	if err != nil {
 		if err := ctr.Delete(context.Background()); err != nil {