Merge pull request #5047 from vvoland/v26.1-5038

[26.1 backport] cli-plugins: PluginRunCommand: use cmd.Environ instead of os.Environ
Merge pull request #5045 from vvoland/vendor-docker-26.1.1-dev
2024-04-30 13:40:03 +02:00 · 2024-04-30 13:12:54 +02:00 · 2024-04-30 13:03:15 +02:00 · 2024-04-30 11:55:51 +02:00 · 2024-04-29 17:46:55 +02:00 · 2024-04-29 16:46:11 +02:00
5 changed files with 11 additions and 6 deletions
--- 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/utils.go
+++ b/cli/command/container/utils.go
@ -2,6 +2,7 @@ package container

 import (
 	"context"
+	"errors"
 	"strconv"

 	"github.com/docker/docker/api/types"
@ -36,6 +37,8 @@ func waitExitOrRemoved(ctx context.Context, apiClient client.APIClient, containe
 	statusC := make(chan int)
 	go func() {
 		select {
+		case <-ctx.Done():
+			return
 		case result := <-resultC:
 			if result.Error != nil {
 				logrus.Errorf("Error waiting for container: %v", result.Error.Message)
@ -44,6 +47,9 @@ func waitExitOrRemoved(ctx context.Context, apiClient client.APIClient, containe
 				statusC <- int(result.StatusCode)
 			}
 		case err := <-errC:
+			if errors.Is(err, context.Canceled) {
+				return
+			}
 			logrus.Errorf("error waiting for container: %v", err)
 			statusC <- 125
 		}
--- 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.1-0.20240430094649-ac2de55998d4+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.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-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.1-0.20240430094649-ac2de55998d4+incompatible
 ## explicit
 github.com/docker/docker/api
 github.com/docker/docker/api/types
Author	SHA1	Message	Date
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
Paweł Gronowski	840016ea05	waitExitOrRemoved: Handle context cancellation Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2024-04-29 16:46:11 +02:00