Skip to content

Commit d7eb935

Browse files
thaJeztahthaJeztah
committed
vendor: github.com/moby/moby/api, github.com/moby/moby/client master
full diffs: - moby/moby@api/v1.52.0-beta.1...0967d6e - moby/moby@client/v0.1.0-beta.0...0967d6e Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 4c5f22a commit d7eb935

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+317
-512
lines changed

‎driver/docker-container/driver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ func (d *Driver) copyToContainer(ctx context.Context, files map[string][]byte) e
286286
}
287287

288288
func (d *Driver) exec(ctx context.Context, cmd []string) (string, net.Conn, error) {
289-
response, err := d.DockerAPI.ContainerExecCreate(ctx, d.Name, container.ExecOptions{
289+
response, err := d.DockerAPI.ContainerExecCreate(ctx, d.Name, dockerclient.ExecCreateOptions{
290290
Cmd: cmd,
291291
AttachStdin: true,
292292
AttachStdout: true,
@@ -301,7 +301,7 @@ func (d *Driver) exec(ctx context.Context, cmd []string) (string, net.Conn, erro
301301
return "", nil, errors.New("exec ID empty")
302302
}
303303

304-
resp, err := d.DockerAPI.ContainerExecAttach(ctx, execID, container.ExecStartOptions{})
304+
resp, err := d.DockerAPI.ContainerExecAttach(ctx, execID, dockerclient.ExecStartOptions{})
305305
if err != nil {
306306
return "", nil, err
307307
}

‎go.mod‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ module github.com/docker/buildx
22

33
go 1.24.0
44

5+
// Need a replace, because master pseudo-version is considered "older" than the 28.x branch
6+
replace github.com/docker/cli => github.com/docker/cli v28.3.4-0.20250925164328-6855d70c52fc+incompatible // master
7+
58
require (
69
github.com/Masterminds/semver/v3 v3.4.0
710
github.com/Microsoft/go-winio v0.6.2
@@ -16,7 +19,7 @@ require (
1619
github.com/creack/pty v1.1.24
1720
github.com/davecgh/go-spew v1.1.1
1821
github.com/distribution/reference v0.6.0
19-
github.com/docker/cli v28.3.4-0.20250905221807-be97096566f2+incompatible // master
22+
github.com/docker/cli v28.4.0+incompatible // master
2023
github.com/docker/cli-docs-tool v0.10.0
2124
github.com/docker/go-units v0.5.0
2225
github.com/gofrs/flock v0.12.1
@@ -30,8 +33,8 @@ require (
3033
github.com/mitchellh/hashstructure/v2 v2.0.2
3134
github.com/moby/buildkit v0.25.0-rc1
3235
github.com/moby/go-archive v0.1.0
33-
github.com/moby/moby/api v1.52.0-beta.1
34-
github.com/moby/moby/client v0.1.0-beta.0
36+
github.com/moby/moby/api v1.52.0-beta.1.0.20250919095748-0967d6ea6ba7 // master
37+
github.com/moby/moby/client v0.1.0-beta.0.0.20250919095748-0967d6ea6ba7 // master
3538
github.com/moby/sys/atomicwriter v0.1.0
3639
github.com/moby/sys/mountinfo v0.7.2
3740
github.com/morikuni/aec v1.0.0

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
109109
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
110110
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
111111
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
112-
github.com/docker/cli v28.3.4-0.20250905221807-be97096566f2+incompatible h1:DLnj6JeVS3rJK1dNkgKEmbdWT6MfHjVDMVw0gp1vP3Q=
113-
github.com/docker/cli v28.3.4-0.20250905221807-be97096566f2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
112+
github.com/docker/cli v28.3.4-0.20250925164328-6855d70c52fc+incompatible h1:ck2NByRh+Q7a2b5QhU85B+eU8vkun8+sj0lFMGVQGBM=
113+
github.com/docker/cli v28.3.4-0.20250925164328-6855d70c52fc+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
114114
github.com/docker/cli-docs-tool v0.10.0 h1:bOD6mKynPQgojQi3s2jgcUWGp/Ebqy1SeCr9VfKQLLU=
115115
github.com/docker/cli-docs-tool v0.10.0/go.mod h1:5EM5zPnT2E7yCLERZmrDA234Vwn09fzRHP4aX1qwp1U=
116116
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
@@ -261,10 +261,10 @@ github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ
261261
github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
262262
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
263263
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
264-
github.com/moby/moby/api v1.52.0-beta.1 h1:r5U4U72E7xSHh4zX72ndY1mA/FOGiAPiGiz2a8rBW+w=
265-
github.com/moby/moby/api v1.52.0-beta.1/go.mod h1:8sBV0soUREiudtow4vqJGOxa4GyHI5vLQmvgKdHq5Ok=
266-
github.com/moby/moby/client v0.1.0-beta.0 h1:eXzrwi0YkzLvezOBKHafvAWNmH1B9HFh4n13yb2QgFE=
267-
github.com/moby/moby/client v0.1.0-beta.0/go.mod h1:irAv8jRi4yKKBeND96Y+3AM9ers+KaJYk9Vmcm7loxs=
264+
github.com/moby/moby/api v1.52.0-beta.1.0.20250919095748-0967d6ea6ba7 h1:4fLP2MHi3WX2LzZZhm3AnU2Xur6NQ62Trvk8ILY4+cg=
265+
github.com/moby/moby/api v1.52.0-beta.1.0.20250919095748-0967d6ea6ba7/go.mod h1:8sBV0soUREiudtow4vqJGOxa4GyHI5vLQmvgKdHq5Ok=
266+
github.com/moby/moby/client v0.1.0-beta.0.0.20250919095748-0967d6ea6ba7 h1:ia/V/IKVZHUjpO3Ho8pThLOD5dLXILYGKYjTzA7cGmA=
267+
github.com/moby/moby/client v0.1.0-beta.0.0.20250919095748-0967d6ea6ba7/go.mod h1:o5CkJu0RlmnLWRZRaEd7fL6wo0Ggr8Hw/UvgqdIUBuI=
268268
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
269269
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
270270
github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU=

‎vendor/github.com/docker/cli/cli-plugins/plugin/plugin.go‎

Lines changed: 17 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/cli/cli/command/cli.go‎

Lines changed: 12 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/cli/cli/command/cli_options.go‎

Lines changed: 12 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/cli/cli/config/configfile/file.go‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/docker/cli/templates/templates.go‎

Lines changed: 14 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)