Skip to content

Commit 62592fb

Browse files
thaJeztahthaJeztah
committed
update to moby/moby/api, moby/moby/client master
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 24b62bd commit 62592fb

File tree

154 files changed

+1062
-1264
lines changed

Some content is hidden

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

154 files changed

+1062
-1264
lines changed

‎build/build.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import (
4141
spb "github.com/moby/buildkit/sourcepolicy/pb"
4242
"github.com/moby/buildkit/util/progress/progresswriter"
4343
"github.com/moby/buildkit/util/tracing"
44-
"github.com/moby/moby/api/types/image"
44+
dockerclient "github.com/moby/moby/client"
4545
"github.com/moby/moby/client/pkg/jsonmessage"
4646
"github.com/opencontainers/go-digest"
4747
ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
@@ -803,7 +803,7 @@ func pushWithMoby(ctx context.Context, d *driver.DriverHandle, name string, l pr
803803
return err
804804
}
805805

806-
rc, err := api.ImagePush(ctx, name, image.PushOptions{
806+
rc, err := api.ImagePush(ctx, name, dockerclient.ImagePushOptions{
807807
RegistryAuth: creds,
808808
})
809809
if err != nil {

‎driver/docker-container/driver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
mobyarchive "github.com/moby/go-archive"
2525
"github.com/moby/moby/api/pkg/stdcopy"
2626
"github.com/moby/moby/api/types/container"
27-
"github.com/moby/moby/api/types/image"
2827
"github.com/moby/moby/api/types/mount"
2928
"github.com/moby/moby/api/types/network"
3029
"github.com/moby/moby/api/types/system"
30+
dockerclient "github.com/moby/moby/client"
3131
"github.com/moby/moby/client/pkg/jsonmessage"
3232
"github.com/pkg/errors"
3333
)
@@ -96,7 +96,7 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
9696
if err != nil {
9797
return err
9898
}
99-
resp, err := d.DockerAPI.ImageCreate(ctx, imageName, image.CreateOptions{
99+
resp, err := d.DockerAPI.ImageCreate(ctx, imageName, dockerclient.ImageCreateOptions{
100100
RegistryAuth: ra,
101101
})
102102
if err != nil {

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/creack/pty v1.1.24
1717
github.com/davecgh/go-spew v1.1.1
1818
github.com/distribution/reference v0.6.0
19-
github.com/docker/cli v28.3.4-0.20250806173736-4beddd3e257b+incompatible
19+
github.com/docker/cli v28.3.4-0.20250828115546-8f25f4fb24b8+incompatible // master
2020
github.com/docker/cli-docs-tool v0.10.0
2121
github.com/docker/go-units v0.5.0
2222
github.com/gofrs/flock v0.12.1
@@ -30,8 +30,8 @@ require (
3030
github.com/mitchellh/hashstructure/v2 v2.0.2
3131
github.com/moby/buildkit v0.24.0-rc1
3232
github.com/moby/go-archive v0.1.0
33-
github.com/moby/moby/api v1.52.0-alpha.1
34-
github.com/moby/moby/client v0.1.0-alpha.0
33+
github.com/moby/moby/api v1.52.0-alpha.1.0.20250828145552-49d20c065e4e // master
34+
github.com/moby/moby/client v0.1.0-alpha.0.0.20250828145552-49d20c065e4e // master
3535
github.com/moby/sys/atomicwriter v0.1.0
3636
github.com/moby/sys/mountinfo v0.7.2
3737
github.com/morikuni/aec v1.0.0
@@ -96,7 +96,7 @@ require (
9696
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
9797
github.com/docker/distribution v2.8.3+incompatible // indirect
9898
github.com/docker/docker-credential-helpers v0.9.3 // indirect
99-
github.com/docker/go-connections v0.5.0 // indirect
99+
github.com/docker/go-connections v0.6.0 // indirect
100100
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
101101
github.com/felixge/httpsnoop v1.0.4 // indirect
102102
github.com/fvbommel/sortorder v1.0.1 // indirect

‎go.sum‎

Lines changed: 8 additions & 8 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.20250806173736-4beddd3e257b+incompatible h1:x2H3keVE4lquildupalKBD29yxXzghgGKXSb56RzGnU=
113-
github.com/docker/cli v28.3.4-0.20250806173736-4beddd3e257b+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
112+
github.com/docker/cli v28.3.4-0.20250828115546-8f25f4fb24b8+incompatible h1:6try12Z9p9Xy4E2PPGwOMW8cWNXKiYDQbwRqRn1/0Ts=
113+
github.com/docker/cli v28.3.4-0.20250828115546-8f25f4fb24b8+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=
@@ -121,8 +121,8 @@ github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj
121121
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
122122
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q=
123123
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
124-
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
125-
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
124+
github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
125+
github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
126126
github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
127127
github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
128128
github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
@@ -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-alpha.1 h1:fzxPD0h6l4LmvPd/rySW7T3G45G8eFTo9qEAEp5UZX0=
265-
github.com/moby/moby/api v1.52.0-alpha.1/go.mod h1:MuA35dxT3DVZpImg0ORGCoZtT2dC1jgPjwH9/CQ/afQ=
266-
github.com/moby/moby/client v0.1.0-alpha.0 h1:1Q393KgwO8L3SznKE+xGZJVDdApgcSM0vIhAEff+acc=
267-
github.com/moby/moby/client v0.1.0-alpha.0/go.mod h1:pVMvmGeD4P9tbgBtEHZKW993Qkj4d1Nu6qhiW3GGJ6k=
264+
github.com/moby/moby/api v1.52.0-alpha.1.0.20250828145552-49d20c065e4e h1:gVHGOElTMjCWs8/dJiTAGbG85ZCdF0bh7kDORWJ0ihM=
265+
github.com/moby/moby/api v1.52.0-alpha.1.0.20250828145552-49d20c065e4e/go.mod h1:8sBV0soUREiudtow4vqJGOxa4GyHI5vLQmvgKdHq5Ok=
266+
github.com/moby/moby/client v0.1.0-alpha.0.0.20250828145552-49d20c065e4e h1:uRnGg1I9FeZ/JEW8iHm1b4HfRH7anSf34KgCDzKeBkk=
267+
github.com/moby/moby/client v0.1.0-alpha.0.0.20250828145552-49d20c065e4e/go.mod h1:7pOYrEHdG7I0dNZEC+yqk/p8ZOxGMR1KgoexzCEDe0w=
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: 14 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 31 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: 5 additions & 5 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: 4 additions & 4 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/defaultcontextstore.go‎

Lines changed: 4 additions & 2 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/formatter/container.go‎

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

0 commit comments

Comments
 (0)