diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0acfb6d2a04a..7e56a9425f45 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -64,7 +64,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v5
with:
- go-version: 1.21.9
+ go-version: 1.21.10
-
name: Test
run: |
diff --git a/Dockerfile b/Dockerfile
index 844368a9c287..4100e26b8b74 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG BASE_VARIANT=alpine
ARG ALPINE_VERSION=3.18
ARG BASE_DEBIAN_DISTRO=bookworm
-ARG GO_VERSION=1.21.9
+ARG GO_VERSION=1.21.10
ARG XX_VERSION=1.4.0
ARG GOVERSIONINFO_VERSION=v1.3.0
ARG GOTESTSUM_VERSION=v1.10.0
diff --git a/cli/command/container/run.go b/cli/command/container/run.go
index 2c4e8d41ea8f..0da127c46379 100644
--- a/cli/command/container/run.go
+++ b/cli/command/container/run.go
@@ -186,7 +186,11 @@ func runContainer(ctx context.Context, dockerCli command.Cli, runOpts *runOption
defer closeFn()
}
- statusChan := waitExitOrRemoved(ctx, apiClient, containerID, copts.autoRemove)
+ // New context here because we don't to cancel waiting on container exit/remove
+ // when we cancel attach, etc.
+ statusCtx, cancelStatusCtx := context.WithCancel(context.WithoutCancel(ctx))
+ defer cancelStatusCtx()
+ statusChan := waitExitOrRemoved(statusCtx, apiClient, containerID, copts.autoRemove)
// start the container
if err := apiClient.ContainerStart(ctx, containerID, container.StartOptions{}); err != nil {
diff --git a/cli/command/container/utils.go b/cli/command/container/utils.go
index 9662ac027ffe..794c0db60949 100644
--- a/cli/command/container/utils.go
+++ b/cli/command/container/utils.go
@@ -36,6 +36,7 @@ func waitExitOrRemoved(ctx context.Context, apiClient client.APIClient, containe
statusC := make(chan int)
go func() {
+ defer close(statusC)
select {
case <-ctx.Done():
return
diff --git a/docker-bake.hcl b/docker-bake.hcl
index bb65406d7806..7da05d743689 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,5 +1,5 @@
variable "GO_VERSION" {
- default = "1.21.9"
+ default = "1.21.10"
}
variable "VERSION" {
default = ""
diff --git a/dockerfiles/Dockerfile.dev b/dockerfiles/Dockerfile.dev
index 593723bc7feb..4f3513b52cf6 100644
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
-ARG GO_VERSION=1.21.9
+ARG GO_VERSION=1.21.10
ARG ALPINE_VERSION=3.18
ARG BUILDX_VERSION=0.12.1
diff --git a/dockerfiles/Dockerfile.lint b/dockerfiles/Dockerfile.lint
index 60200bc85846..13717064d343 100644
--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
-ARG GO_VERSION=1.21.9
+ARG GO_VERSION=1.21.10
ARG ALPINE_VERSION=3.18
ARG GOLANGCI_LINT_VERSION=v1.55.2
diff --git a/dockerfiles/Dockerfile.vendor b/dockerfiles/Dockerfile.vendor
index 0030f15123d1..84fbc4811a9f 100644
--- a/dockerfiles/Dockerfile.vendor
+++ b/dockerfiles/Dockerfile.vendor
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
-ARG GO_VERSION=1.21.9
+ARG GO_VERSION=1.21.10
ARG ALPINE_VERSION=3.18
ARG MODOUTDATED_VERSION=v0.8.0
diff --git a/e2e/container/run_test.go b/e2e/container/run_test.go
index cffd1aeb8d46..fa8ea72b0334 100644
--- a/e2e/container/run_test.go
+++ b/e2e/container/run_test.go
@@ -4,6 +4,7 @@ import (
"fmt"
"strings"
"testing"
+ "time"
"github.com/docker/cli/e2e/internal/fixtures"
"github.com/docker/cli/internal/test/environment"
@@ -34,6 +35,22 @@ func TestRunAttachedFromRemoteImageAndRemove(t *testing.T) {
golden.Assert(t, result.Stderr(), "run-attached-from-remote-and-remove.golden")
}
+// Regression test for https://github.com/docker/cli/issues/5053
+func TestRunInvalidEntrypointWithAutoremove(t *testing.T) {
+ environment.SkipIfDaemonNotLinux(t)
+
+ result := make(chan *icmd.Result)
+ go func() {
+ result <- icmd.RunCommand("docker", "run", "--rm", fixtures.AlpineImage, "invalidcommand")
+ }()
+ select {
+ case r := <-result:
+ r.Assert(t, icmd.Expected{ExitCode: 127})
+ case <-time.After(4 * time.Second):
+ t.Fatal("test took too long, shouldn't hang")
+ }
+}
+
func TestRunWithContentTrust(t *testing.T) {
skip.If(t, environment.RemoteDaemon())
diff --git a/e2e/testdata/Dockerfile.gencerts b/e2e/testdata/Dockerfile.gencerts
index 67a53d4b127f..55b7a66b1510 100644
--- a/e2e/testdata/Dockerfile.gencerts
+++ b/e2e/testdata/Dockerfile.gencerts
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
-ARG GO_VERSION=1.21.9
+ARG GO_VERSION=1.21.10
FROM golang:${GO_VERSION}-alpine AS generated
ENV GOTOOLCHAIN=local
diff --git a/vendor.mod b/vendor.mod
index 4c02348e28c1..04bfe35039c9 100644
--- a/vendor.mod
+++ b/vendor.mod
@@ -12,7 +12,7 @@ require (
github.com/creack/pty v1.1.21
github.com/distribution/reference v0.5.0
github.com/docker/distribution v2.8.3+incompatible
- github.com/docker/docker v26.1.1-0.20240430094649-ac2de55998d4+incompatible
+ github.com/docker/docker v26.1.2-0.20240508085902-ef1912d8b6ae+incompatible
github.com/docker/docker-credential-helpers v0.8.1
github.com/docker/go-connections v0.5.0
github.com/docker/go-units v0.5.0
diff --git a/vendor.sum b/vendor.sum
index 2d7153d9d793..1c588b1602d0 100644
--- a/vendor.sum
+++ b/vendor.sum
@@ -57,8 +57,8 @@ github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v26.1.1-0.20240430094649-ac2de55998d4+incompatible h1:z6g58Ao0MTHcTLDDZfsJEifSZSSEuc9siuHMMST1WH0=
-github.com/docker/docker v26.1.1-0.20240430094649-ac2de55998d4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v26.1.2-0.20240508085902-ef1912d8b6ae+incompatible h1:PcRQNw8eAMTjdnD7+y3IeJcsCKqxHmlT0MmqfNs9Jc4=
+github.com/docker/docker v26.1.2-0.20240508085902-ef1912d8b6ae+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo=
github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 19958b96b1fb..24a4e13bf971 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -56,7 +56,7 @@ github.com/docker/distribution/registry/client/transport
github.com/docker/distribution/registry/storage/cache
github.com/docker/distribution/registry/storage/cache/memory
github.com/docker/distribution/uuid
-# github.com/docker/docker v26.1.1-0.20240430094649-ac2de55998d4+incompatible
+# github.com/docker/docker v26.1.2-0.20240508085902-ef1912d8b6ae+incompatible
## explicit
github.com/docker/docker/api
github.com/docker/docker/api/types