Merge pull request #5066 from vvoland/vendor-docker

[26.1] vendor: github.com/docker/docker v26.1.2-dev (ef1912d8b6ae)
Merge pull request #5065 from vvoland/v26.1-5064
2024-05-08 11:31:07 +02:00 · 2024-05-08 11:30:55 +02:00 · 2024-05-08 11:04:04 +02:00 · 2024-05-08 09:52:05 +02:00 · 2024-05-07 13:35:09 +02:00 · 2024-05-07 11:57:36 +01:00
14 changed files with 35 additions and 14 deletions
--- 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: |
--- a/2
+++ b/2
@ -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
--- a/cli-plugins/manager/manager.go
+++ b/cli-plugins/manager/manager.go
@ -240,8 +240,7 @@ func PluginRunCommand(dockerCli command.Cli, name string, rootcmd *cobra.Command
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr

-		cmd.Env = os.Environ()
-		cmd.Env = append(cmd.Env, ReexecEnvvar+"="+os.Args[0])
+		cmd.Env = append(cmd.Environ(), ReexecEnvvar+"="+os.Args[0])
 		cmd.Env = appendPluginResourceAttributesEnvvar(cmd.Env, rootcmd, plugin)

 		return cmd, nil
--- 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 {
--- 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
--- 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 = ""
--- 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
--- 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

--- 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

--- 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())

--- 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
--- 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.0.1-0.20240422144514-c8af8ebe4a89+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
--- 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.0.1-0.20240422144514-c8af8ebe4a89+incompatible h1:9eSHthT5Vvfh3aYy9xUaxMuecDicnMjfe7s9/qndRMw=
-github.com/docker/docker v26.0.1-0.20240422144514-c8af8ebe4a89+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=
--- 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.0.1-0.20240422144514-c8af8ebe4a89+incompatible
+# github.com/docker/docker v26.1.2-0.20240508085902-ef1912d8b6ae+incompatible
 ## explicit
 github.com/docker/docker/api
 github.com/docker/docker/api/types
Author	SHA1	Message	Date
Paweł Gronowski	211e74b240	Merge pull request #5066 from vvoland/vendor-docker Some checks failed build / prepare-plugins (push) Has been cancelled Details build / plugins (push) Has been cancelled Details codeql / codeql (push) Has been cancelled Details e2e / e2e (alpine, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 23, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 24, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 24, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 24, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 25, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 25, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 25, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 23, experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 24, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 24, experimental) (push) Has been cancelled Details e2e / e2e (debian, 24, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 25, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 25, experimental) (push) Has been cancelled Details e2e / e2e (debian, 25, non-experimental) (push) Has been cancelled Details test / ctn (push) Has been cancelled Details test / host (macos-12) (push) Has been cancelled Details validate / validate (lint) (push) Has been cancelled Details validate / validate (shellcheck) (push) Has been cancelled Details validate / validate (update-authors) (push) Has been cancelled Details validate / validate (validate-vendor) (push) Has been cancelled Details validate / validate-md (push) Has been cancelled Details validate / validate-make (manpages) (push) Has been cancelled Details validate / validate-make (yamldocs) (push) Has been cancelled Details [26.1] vendor: github.com/docker/docker v26.1.2-dev (ef1912d8b6ae)	2024-05-08 11:31:07 +02:00
Paweł Gronowski	8beff78d85	Merge pull request #5065 from vvoland/v26.1-5064 [26.1 backport] update to go1.21.10	2024-05-08 11:30:55 +02:00
Paweł Gronowski	e64914c890	vendor: github.com/docker/docker v26.1.2-dev (ef1912d8b6ae) - full diff: `ac2de55998...ef1912d8b6` Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2024-05-08 11:04:04 +02:00
Paweł Gronowski	c1d70d1fbb	update to go1.21.10 These minor releases include 2 security fixes following the security policy: - cmd/go: arbitrary code execution during build on darwin On Darwin, building a Go module which contains CGO can trigger arbitrary code execution when using the Apple version of ld, due to usage of the -lto_library flag in a "#cgo LDFLAGS" directive. Thanks to Juho Forsén of Mattermost for reporting this issue. This is CVE-2024-24787 and Go issue https://go.dev/issue/67119. - net: malformed DNS message can cause infinite loop A malformed DNS message in response to a query can cause the Lookup functions to get stuck in an infinite loop. Thanks to long-name-let-people-remember-you on GitHub for reporting this issue, and to Mateusz Poliwczak for bringing the issue to our attention. This is CVE-2024-24788 and Go issue https://go.dev/issue/66754. View the release notes for more information: https://go.dev/doc/devel/release#go1.22.3 - https://github.com/golang/go/issues?q=milestone%3AGo1.21.10+label%3ACherryPickApproved - full diff: https://github.com/golang/go/compare/go1.21.9...go1.21.10 - Description for the changelog ```markdown changelog Update Go runtime to 1.21.10 ``` Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit `eb99994c75`) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2024-05-08 09:52:05 +02:00
Paweł Gronowski	53a3f0be18	Merge pull request #5062 from laurazard/cherry-pick-run-hang [26.1 backport] Fix hang when container fails to start	2024-05-07 13:35:09 +02:00
Laura Brehm	4add46d686	Add e2e tests for run w/ bad entrypoint Signed-off-by: Laura Brehm <laurabrehm@hey.com> (cherry picked from commit `8d6e571c03`) Signed-off-by: Laura Brehm <laurabrehm@hey.com>	2024-05-07 11:57:36 +01:00
Laura Brehm	ccea7d8a30	Fix hang when container fails to start Signed-off-by: Laura Brehm <laurabrehm@hey.com> (cherry picked from commit `31644d5ea7`) Signed-off-by: Laura Brehm <laurabrehm@hey.com>	2024-05-07 11:57:24 +01:00
Paweł Gronowski	4cf5afaefa	Merge pull request #5047 from vvoland/v26.1-5038 Some checks failed build / prepare-plugins (push) Has been cancelled Details build / plugins (push) Has been cancelled Details codeql / codeql (push) Has been cancelled Details e2e / e2e (alpine, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 23, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 24, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 24, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 24, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 25, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 25, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 25, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 23, experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 24, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 24, experimental) (push) Has been cancelled Details e2e / e2e (debian, 24, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 25, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 25, experimental) (push) Has been cancelled Details e2e / e2e (debian, 25, non-experimental) (push) Has been cancelled Details test / ctn (push) Has been cancelled Details test / host (macos-12) (push) Has been cancelled Details validate / validate (lint) (push) Has been cancelled Details validate / validate (shellcheck) (push) Has been cancelled Details validate / validate (update-authors) (push) Has been cancelled Details validate / validate (validate-vendor) (push) Has been cancelled Details validate / validate-md (push) Has been cancelled Details validate / validate-make (manpages) (push) Has been cancelled Details validate / validate-make (yamldocs) (push) Has been cancelled Details [26.1 backport] cli-plugins: PluginRunCommand: use cmd.Environ instead of os.Environ	2024-04-30 13:40:03 +02:00
Paweł Gronowski	6c2b06d535	Merge pull request #5045 from vvoland/vendor-docker-26.1.1-dev [26.1] vendor: github.com/docker/docker ac2de55998d4 (v26.1.1)	2024-04-30 13:12:54 +02:00
Sebastiaan van Stijn	1c6a8ecf2e	cli-plugins: PluginRunCommand: use cmd.Environ instead of os.Environ Commit `5011759056` implemented a fix that caused the current environment to be discarded, using `os.Environ()`. On Windows, `os.Environ()` may produce an incorrect value for `PWD`, for which a new function was added in go1.19; - https://tip.golang.org/doc/go1.19#osexecpkgosexec - https://go-review.googlesource.com/c/go/+/401340 Replace the use of `os.Environ()` with `cmd.Environ()` to address that. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `5ccb48459b`) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2024-04-30 13:03:15 +02:00
Paweł Gronowski	6d1c387af2	vendor: github.com/docker/docker ac2de55998d4 (v26.1.1) full diff: `c8af8ebe4a...ac2de55998` Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2024-04-30 11:55:51 +02:00
Paweł Gronowski	1e6db5d24b	Merge pull request #5044 from vvoland/wait-cancel-noerror [26.1 backport] waitExitOrRemoved: Handle context cancellation	2024-04-29 17:46:55 +02:00