Skip to content

vendor: docker and docker/cli v23.0.0-rc.1#3435

Merged
crazy-max merged 3 commits intomoby:masterfrom
thaJeztah:bump_engine
Jan 3, 2023
Merged

vendor: docker and docker/cli v23.0.0-rc.1#3435
crazy-max merged 3 commits intomoby:masterfrom
thaJeztah:bump_engine

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

vendor: github.com/containerd/containerd v1.6.14

full diff: containerd/containerd@v1.6.13...v1.6.14

vendor: github.com/docker/docker v23.0.0-rc.1

full diff: moby/moby@v23.0.0-beta.1...v23.0.0-rc.1

vendor: github.com/docker/cli v23.0.0-rc.1

full diff: docker/cli@v23.0.0-beta.1...v23.0.0-rc.1

err error
)
c.cmd = exec.CommandContext(ctx, cmd, args...)
c.cmd = exec.Command(cmd, args...)
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seeing a ton of failures in CI; initially was wondering if there's any relation to this change, but at a glance, I don't think that change should make a difference; all calls pass a fresh context.Background();

git grep 'commandconn.New'
client/connhelper/dockercontainer/dockercontainer.go:                   return commandconn.New(context.Background(), "docker", append(ctxFlags, []string{"exec", "-i", sp.Container, "buildctl", "dial-stdio"}...)...)
client/connhelper/kubepod/kubepod.go:                   return commandconn.New(context.Background(), "kubectl", "--context="+sp.Context, "--namespace="+sp.Namespace,
client/connhelper/podmancontainer/podmancontainer.go:                   return commandconn.New(context.Background(), "podman", "exec", "-i", sp.Container, "buildctl", "dial-stdio")
client/connhelper/ssh/ssh.go:                   return commandconn.New(context.Background(), "ssh", args...)
vendor/github.com/docker/cli/cli/connhelper/commandconn/commandconn.go://                               return commandconn.New(ctx, "docker", "exec", "-it", containerID, "docker", "system", "dial-stdio")

full diff: containerd/containerd@v1.6.13...v1.6.14

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: moby/moby@v23.0.0-beta.1...v23.0.0-rc.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: docker/cli@v23.0.0-beta.1...v23.0.0-rc.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

@tonistiigi PTAL (backport as well in #3441)

@crazy-max crazy-max merged commit 71fce0a into moby:master Jan 3, 2023
@thaJeztah thaJeztah deleted the bump_engine branch January 3, 2023 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants