Skip to content

Commit 2bc0c39

Browse files
thaJeztahthaJeztah
committed
update modules
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 0f04b85 commit 2bc0c39

Some content is hidden

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

52 files changed

+907
-632
lines changed

‎driver/docker-container/driver.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"github.com/moby/moby/api/types/container"
2727
"github.com/moby/moby/api/types/mount"
2828
"github.com/moby/moby/api/types/network"
29-
"github.com/moby/moby/api/types/system"
3029
dockerclient "github.com/moby/moby/client"
3130
"github.com/moby/moby/client/pkg/jsonmessage"
31+
"github.com/moby/moby/client/pkg/security"
3232
"github.com/pkg/errors"
3333
)
3434

@@ -195,7 +195,7 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
195195
}
196196
}
197197

198-
secOpts, err := system.DecodeSecurityOptions(info.SecurityOptions)
198+
secOpts, err := security.DecodeOptions(info.SecurityOptions)
199199
if err != nil {
200200
return err
201201
}
@@ -251,7 +251,7 @@ func (d *Driver) wait(ctx context.Context, l progress.SubLogger) error {
251251
}
252252

253253
func (d *Driver) copyLogs(ctx context.Context, l progress.SubLogger) error {
254-
rc, err := d.DockerAPI.ContainerLogs(ctx, d.Name, container.LogsOptions{
254+
rc, err := d.DockerAPI.ContainerLogs(ctx, d.Name, dockerclient.ContainerLogsOptions{
255255
ShowStdout: true, ShowStderr: true,
256256
})
257257
if err != nil {
@@ -282,7 +282,7 @@ func (d *Driver) copyToContainer(ctx context.Context, files map[string][]byte) e
282282
defer srcArchive.Close()
283283

284284
baseDir := path.Dir(confutil.DefaultBuildKitConfigDir)
285-
return d.DockerAPI.CopyToContainer(ctx, d.Name, baseDir, srcArchive, container.CopyToContainerOptions{})
285+
return d.DockerAPI.CopyToContainer(ctx, d.Name, baseDir, srcArchive, dockerclient.CopyToContainerOptions{})
286286
}
287287

288288
func (d *Driver) exec(ctx context.Context, cmd []string) (string, net.Conn, error) {
@@ -328,7 +328,7 @@ func (d *Driver) run(ctx context.Context, cmd []string, stdout, stderr io.Writer
328328
}
329329

330330
func (d *Driver) start(ctx context.Context) error {
331-
return d.DockerAPI.ContainerStart(ctx, d.Name, container.StartOptions{})
331+
return d.DockerAPI.ContainerStart(ctx, d.Name, dockerclient.ContainerStartOptions{})
332332
}
333333

334334
func (d *Driver) Info(ctx context.Context) (*driver.Info, error) {
@@ -375,7 +375,7 @@ func (d *Driver) Stop(ctx context.Context, force bool) error {
375375
return err
376376
}
377377
if info.Status == driver.Running {
378-
return d.DockerAPI.ContainerStop(ctx, d.Name, container.StopOptions{})
378+
return d.DockerAPI.ContainerStop(ctx, d.Name, dockerclient.ContainerStopOptions{})
379379
}
380380
return nil
381381
}
@@ -391,7 +391,7 @@ func (d *Driver) Rm(ctx context.Context, force, rmVolume, rmDaemon bool) error {
391391
return err
392392
}
393393
if rmDaemon {
394-
if err := d.DockerAPI.ContainerRemove(ctx, d.Name, container.RemoveOptions{
394+
if err := d.DockerAPI.ContainerRemove(ctx, d.Name, dockerclient.ContainerRemoveOptions{
395395
RemoveVolumes: true,
396396
Force: force,
397397
}); err != nil {
@@ -475,7 +475,7 @@ func (d *Driver) hasGPUCapability(ctx context.Context, image string, gpus []cont
475475
if err != nil {
476476
return false
477477
}
478-
if err := d.DockerAPI.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {
478+
if err := d.DockerAPI.ContainerStart(ctx, resp.ID, dockerclient.ContainerStartOptions{}); err != nil {
479479
return false
480480
}
481481
return true

‎go.mod‎

Lines changed: 3 additions & 3 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.20250828115546-8f25f4fb24b8+incompatible // master
19+
github.com/docker/cli v28.3.4-0.20250905221807-be97096566f2+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
3232
github.com/moby/go-archive v0.1.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
33+
github.com/moby/moby/api v1.52.0-beta.1
34+
github.com/moby/moby/client v0.1.0-beta.0
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

‎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.20250828115546-8f25f4fb24b8+incompatible h1:6try12Z9p9Xy4E2PPGwOMW8cWNXKiYDQbwRqRn1/0Ts=
113-
github.com/docker/cli v28.3.4-0.20250828115546-8f25f4fb24b8+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
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=
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-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=
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=
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/AUTHORS‎

Lines changed: 10 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/cli.go‎

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

0 commit comments

Comments
 (0)