Skip to content

Commit 04fd1f2

Browse files
dependabot[bot]dependabot[bot]
authored
build(deps): bump github.com/docker/docker (#6595)
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 27.1.1+incompatible to 28.0.0+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v27.1.1...v28.0.0) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-version: 28.0.0+incompatible dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Nick Santos <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent b802b0d commit 04fd1f2

File tree

173 files changed

+3864
-2417
lines changed

Some content is hidden

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

173 files changed

+3864
-2417
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1212
github.com/distribution/reference v0.6.0
1313
github.com/docker/cli v27.1.1+incompatible
14-
github.com/docker/docker v27.1.1+incompatible
14+
github.com/docker/docker v28.0.0+incompatible
1515
github.com/docker/go-connections v0.5.0
1616
github.com/docker/go-units v0.5.0
1717
github.com/fatih/color v1.13.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2
178178
github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
179179
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
180180
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
181-
github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY=
182-
github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
181+
github.com/docker/docker v28.0.0+incompatible h1:Olh0KS820sJ7nPsBKChVhk5pzqcwDR15fumfAd/p9hM=
182+
github.com/docker/docker v28.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
183183
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
184184
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
185185
github.com/docker/go v1.5.1-1 h1:hr4w35acWBPhGBXlzPoHpmZ/ygPjnmFVxGxxGnMyP7k=

‎internal/docker/client.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ type Client interface {
111111

112112
NewVersionError(ctx context.Context, APIrequired, feature string) error
113113
BuildCachePrune(ctx context.Context, opts types.BuildCachePruneOptions) (*types.BuildCachePruneReport, error)
114-
ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error)
114+
ContainersPrune(ctx context.Context, pruneFilters filters.Args) (typescontainer.PruneReport, error)
115115
}
116116

117117
// Add-on interface for a client that manages multiple clients transparently.
@@ -578,7 +578,7 @@ func (c *Cli) ContainerRestartNoWait(ctx context.Context, containerID string) er
578578

579579
func (c *Cli) ExecInContainer(ctx context.Context, cID container.ID, cmd model.Cmd, in io.Reader, out io.Writer) error {
580580
attachStdin := in != nil
581-
cfg := types.ExecConfig{
581+
cfg := typescontainer.ExecOptions{
582582
Cmd: cmd.Argv,
583583
AttachStdout: true,
584584
AttachStderr: true,
@@ -604,13 +604,13 @@ func (c *Cli) ExecInContainer(ctx context.Context, cID container.ID, cmd model.C
604604
return errors.Wrap(err, "ExecInContainer#create")
605605
}
606606

607-
connection, err := c.ContainerExecAttach(createCtx, execId.ID, types.ExecStartCheck{Tty: true})
607+
connection, err := c.ContainerExecAttach(createCtx, execId.ID, typescontainer.ExecAttachOptions{Tty: true})
608608
if err != nil {
609609
return errors.Wrap(err, "ExecInContainer#attach")
610610
}
611611
defer connection.Close()
612612

613-
err = c.ContainerExecStart(createCtx, execId.ID, types.ExecStartCheck{})
613+
err = c.ContainerExecStart(createCtx, execId.ID, typescontainer.ExecStartOptions{})
614614
if err != nil {
615615
return errors.Wrap(err, "ExecInContainer#start")
616616
}

‎internal/docker/exploding.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ func (c explodingClient) NewVersionError(ctx context.Context, apiRequired, featu
8989
func (c explodingClient) BuildCachePrune(ctx context.Context, opts types.BuildCachePruneOptions) (*types.BuildCachePruneReport, error) {
9090
return nil, c.err
9191
}
92-
func (c explodingClient) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error) {
93-
return types.ContainersPruneReport{}, c.err
92+
func (c explodingClient) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (typescontainer.PruneReport, error) {
93+
return typescontainer.PruneReport{}, c.err
9494
}
9595

9696
var _ Client = &explodingClient{}

‎internal/docker/fake_client.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,14 +393,14 @@ func (c *FakeClient) BuildCachePrune(ctx context.Context, opts types.BuildCacheP
393393
return report, nil
394394
}
395395

396-
func (c *FakeClient) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error) {
396+
func (c *FakeClient) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (typescontainer.PruneReport, error) {
397397
if err := c.ContainersPruneErr; err != nil {
398398
c.ContainersPruneErr = nil
399-
return types.ContainersPruneReport{}, err
399+
return typescontainer.PruneReport{}, err
400400
}
401401

402402
c.ContainersPruneFilters = pruneFilters.Clone()
403-
report := types.ContainersPruneReport{
403+
report := typescontainer.PruneReport{
404404
ContainersDeleted: c.ContainersPruned,
405405
SpaceReclaimed: uint64(units.MB * len(c.ContainersPruned)), // 1MB per container pruned
406406
}

‎internal/docker/switch.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func (c *switchCli) NewVersionError(ctx context.Context, apiRequired, feature st
124124
func (c *switchCli) BuildCachePrune(ctx context.Context, opts types.BuildCachePruneOptions) (*types.BuildCachePruneReport, error) {
125125
return c.client(ctx).BuildCachePrune(ctx, opts)
126126
}
127-
func (c *switchCli) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error) {
127+
func (c *switchCli) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (typescontainer.PruneReport, error) {
128128
return c.client(ctx).ContainersPrune(ctx, pruneFilters)
129129
}
130130

‎internal/engine/dockerprune/docker_pruner.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/docker/go-units"
1111

1212
"github.com/docker/docker/api/types"
13+
typescontainer "github.com/docker/docker/api/types/container"
1314
"github.com/docker/docker/api/types/filters"
1415
typesimage "github.com/docker/docker/api/types/image"
1516

@@ -262,15 +263,15 @@ func (dp *DockerPruner) filterOutMostRecentInspects(ctx context.Context, inspect
262263
return result
263264
}
264265

265-
func (dp *DockerPruner) deleteOldImages(ctx context.Context, maxAge time.Duration, keepRecent int, selectors []container.RefSelector) (types.ImagesPruneReport, error) {
266+
func (dp *DockerPruner) deleteOldImages(ctx context.Context, maxAge time.Duration, keepRecent int, selectors []container.RefSelector) (typesimage.PruneReport, error) {
266267
opts := typesimage.ListOptions{
267268
Filters: filters.NewArgs(
268269
filters.Arg("label", gcEnabledSelector),
269270
),
270271
}
271272
imgs, err := dp.dCli.ImageList(ctx, opts)
272273
if err != nil {
273-
return types.ImagesPruneReport{}, err
274+
return typesimage.PruneReport{}, err
274275
}
275276

276277
inspects := dp.inspectImages(ctx, imgs)
@@ -294,7 +295,7 @@ func (dp *DockerPruner) deleteOldImages(ctx context.Context, maxAge time.Duratio
294295
reclaimedBytes += uint64(inspect.Size)
295296
}
296297

297-
return types.ImagesPruneReport{
298+
return typesimage.PruneReport{
298299
ImagesDeleted: responseItems,
299300
SpaceReclaimed: reclaimedBytes,
300301
}, nil
@@ -305,7 +306,7 @@ func (dp *DockerPruner) sufficientVersionError() error {
305306
"1.30", "image | container prune with filter: label")
306307
}
307308

308-
func prettyPrintImagesPruneReport(report types.ImagesPruneReport, l logger.Logger) {
309+
func prettyPrintImagesPruneReport(report typesimage.PruneReport, l logger.Logger) {
309310
if len(report.ImagesDeleted) == 0 && !l.Level().ShouldDisplay(logger.VerboseLvl) {
310311
return
311312
}
@@ -341,7 +342,7 @@ func prettyPrintCachePruneReport(report *types.BuildCachePruneReport, l logger.L
341342
}
342343
}
343344

344-
func prettyPrintContainersPruneReport(report types.ContainersPruneReport, l logger.Logger) {
345+
func prettyPrintContainersPruneReport(report typescontainer.PruneReport, l logger.Logger) {
345346
if len(report.ContainersDeleted) == 0 && !l.Level().ShouldDisplay(logger.VerboseLvl) {
346347
return
347348
}

‎vendor/github.com/docker/docker/AUTHORS‎

Lines changed: 31 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/docker/api/common.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)