Skip to content

Commit d34b362

Browse files
crazy-maxcrazy-max
authored
Merge pull request #1458 from crazy-max/dependabot/go_modules/github.com/docker/docker-28.3.3incompatible
chore(deps): bump github.com/docker/docker from 27.3.1+incompatible to 28.3.3+incompatible
2 parents b3ca7a2 + 528d96d commit d34b362

File tree

205 files changed

+5392
-2905
lines changed

Some content is hidden

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

205 files changed

+5392
-2905
lines changed

‎go.mod‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/crazy-max/gohealthchecks v0.5.0
1515
github.com/crazy-max/gonfig v0.7.1
1616
github.com/distribution/reference v0.6.0
17-
github.com/docker/docker v27.3.1+incompatible
17+
github.com/docker/docker v28.3.3+incompatible
1818
github.com/docker/go-connections v0.5.0
1919
github.com/docker/go-units v0.5.0
2020
github.com/dromara/carbon/v2 v2.6.11
@@ -63,6 +63,8 @@ require (
6363
github.com/andybalholm/cascadia v1.3.2 // indirect
6464
github.com/aokoli/goutils v1.0.1 // indirect
6565
github.com/aymerick/douceur v0.2.0 // indirect
66+
github.com/containerd/errdefs v0.3.0 // indirect
67+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
6668
github.com/containerd/log v0.1.0 // indirect
6769
github.com/containerd/typeurl/v2 v2.2.0 // indirect
6870
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
@@ -113,6 +115,7 @@ require (
113115
github.com/mitchellh/go-homedir v1.1.0 // indirect
114116
github.com/mitchellh/mapstructure v1.5.0 // indirect
115117
github.com/moby/docker-image-spec v1.3.1 // indirect
118+
github.com/moby/sys/atomicwriter v0.1.0 // indirect
116119
github.com/moby/sys/capability v0.3.0 // indirect
117120
github.com/moby/sys/mountinfo v0.7.2 // indirect
118121
github.com/moby/sys/user v0.3.0 // indirect

‎go.sum‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
5353
github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
5454
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
5555
github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
56+
github.com/containerd/errdefs v0.3.0 h1:FSZgGOeK4yuT/+DnF07/Olde/q4KBoMsaamhXxIMDp4=
57+
github.com/containerd/errdefs v0.3.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
58+
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
59+
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
5660
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
5761
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
5862
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
@@ -86,8 +90,8 @@ github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPD
8690
github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
8791
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
8892
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
89-
github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI=
90-
github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
93+
github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
94+
github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
9195
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
9296
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
9397
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -248,10 +252,14 @@ github.com/moby/buildkit v0.17.3 h1:XN8ddC5gO1kGJJfi86kzvDlPOyLyPk66hTvswqhj6NQ=
248252
github.com/moby/buildkit v0.17.3/go.mod h1:vr5vltV8wt4F2jThbNOChfbAklJ0DOW11w36v210hOg=
249253
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
250254
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
255+
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
256+
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
251257
github.com/moby/sys/capability v0.3.0 h1:kEP+y6te0gEXIaeQhIi0s7vKs/w0RPoH1qPa6jROcVg=
252258
github.com/moby/sys/capability v0.3.0/go.mod h1:4g9IK291rVkms3LKCDOoYlnV8xKwoDTpIrNEE35Wq0I=
253259
github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
254260
github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
261+
github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
262+
github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
255263
github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo=
256264
github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
257265
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=

‎internal/provider/docker/container.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/crazy-max/diun/v4/internal/model"
1010
"github.com/crazy-max/diun/v4/internal/provider"
1111
"github.com/crazy-max/diun/v4/pkg/docker"
12-
"github.com/docker/docker/api/types"
12+
"github.com/docker/docker/api/types/container"
1313
"github.com/docker/docker/api/types/filters"
1414
"github.com/docker/go-units"
1515
)
@@ -43,7 +43,7 @@ func (c *Client) listContainerImage() []model.Image {
4343
var list []model.Image
4444
for _, ctn := range ctns {
4545
imageName := ctn.Image
46-
imageRaw, err := cli.ImageInspectWithRaw(imageName)
46+
imageInfo, err := cli.ImageInspect(imageName)
4747
if err != nil {
4848
c.logger.Error().Err(err).
4949
Str("ctn_id", ctn.ID).
@@ -52,15 +52,15 @@ func (c *Client) listContainerImage() []model.Image {
5252
continue
5353
}
5454

55-
if local := cli.IsLocalImage(imageRaw); local {
55+
if local := cli.IsLocalImage(imageInfo); local {
5656
c.logger.Debug().
5757
Str("ctn_id", ctn.ID).
5858
Str("ctn_image", imageName).
5959
Msg("Skip locally built image")
6060
continue
6161
}
6262

63-
if dangling := cli.IsDanglingImage(imageRaw); dangling {
63+
if dangling := cli.IsDanglingImage(imageInfo); dangling {
6464
c.logger.Debug().
6565
Str("ctn_id", ctn.ID).
6666
Str("ctn_image", imageName).
@@ -69,18 +69,18 @@ func (c *Client) listContainerImage() []model.Image {
6969
}
7070

7171
if cli.IsDigest(imageName) {
72-
if len(imageRaw.RepoDigests) > 0 {
72+
if len(imageInfo.RepoDigests) > 0 {
7373
c.logger.Debug().
7474
Str("ctn_id", ctn.ID).
7575
Str("ctn_image", imageName).
76-
Strs("img_repodigests", imageRaw.RepoDigests).
76+
Strs("img_repodigests", imageInfo.RepoDigests).
7777
Msg("Using first image repo digest available as image name")
78-
imageName = imageRaw.RepoDigests[0]
78+
imageName = imageInfo.RepoDigests[0]
7979
} else {
8080
c.logger.Debug().
8181
Str("ctn_id", ctn.ID).
8282
Str("ctn_image", imageName).
83-
Strs("img_repodigests", imageRaw.RepoDigests).
83+
Strs("img_repodigests", imageInfo.RepoDigests).
8484
Msg("Skip unknown image digest ref")
8585
continue
8686
}
@@ -115,7 +115,7 @@ func (c *Client) listContainerImage() []model.Image {
115115
return list
116116
}
117117

118-
func metadata(ctn types.Container) map[string]string {
118+
func metadata(ctn container.Summary) map[string]string {
119119
return map[string]string{
120120
"ctn_id": ctn.ID,
121121
"ctn_names": formatNames(ctn.Names),

‎pkg/docker/container.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ package docker
33
import (
44
"sort"
55

6-
"github.com/docker/docker/api/types"
76
"github.com/docker/docker/api/types/container"
87
"github.com/docker/docker/api/types/filters"
98
)
109

1110
// ContainerList returns Docker containers
12-
func (c *Client) ContainerList(filterArgs filters.Args) ([]types.Container, error) {
11+
func (c *Client) ContainerList(filterArgs filters.Args) ([]container.Summary, error) {
1312
containers, err := c.API.ContainerList(c.ctx, container.ListOptions{
1413
Filters: filterArgs,
1514
})

‎pkg/docker/image.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package docker
33
import (
44
"regexp"
55

6-
"github.com/docker/docker/api/types"
6+
"github.com/docker/docker/api/types/container"
7+
"github.com/docker/docker/api/types/image"
78
)
89

910
// ContainerInspect returns the container information.
10-
func (c *Client) ContainerInspect(containerID string) (types.ContainerJSON, error) {
11+
func (c *Client) ContainerInspect(containerID string) (container.InspectResponse, error) {
1112
return c.API.ContainerInspect(c.ctx, containerID)
1213
}
1314

@@ -16,20 +17,19 @@ func (c *Client) IsDigest(imageID string) bool {
1617
return regexp.MustCompile(`^(@|sha256:|@sha256:)([0-9a-f]{64})$`).MatchString(imageID)
1718
}
1819

19-
// ImageInspectWithRaw returns the image information and its raw representation.
20-
func (c *Client) ImageInspectWithRaw(imageID string) (types.ImageInspect, error) {
21-
imageRaw, _, err := c.API.ImageInspectWithRaw(c.ctx, imageID)
22-
return imageRaw, err
20+
// ImageInspect returns the image information.
21+
func (c *Client) ImageInspect(imageID string) (image.InspectResponse, error) {
22+
return c.API.ImageInspect(c.ctx, imageID)
2323
}
2424

2525
// IsLocalImage checks if the image has been built locally
26-
func (c *Client) IsLocalImage(image types.ImageInspect) bool {
26+
func (c *Client) IsLocalImage(image image.InspectResponse) bool {
2727
return len(image.RepoDigests) == 0
2828
}
2929

3030
// IsDanglingImage returns whether the given image is "dangling" which means
3131
// that there are no repository references to the given image and it has no
3232
// child images
33-
func (c *Client) IsDanglingImage(image types.ImageInspect) bool {
33+
func (c *Client) IsDanglingImage(image image.InspectResponse) bool {
3434
return len(image.RepoTags) == 1 && image.RepoTags[0] == "<none>:<none>" && len(image.RepoDigests) == 1 && image.RepoDigests[0] == "<none>@<none>"
3535
}

‎pkg/docker/service.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ package docker
33
import (
44
"sort"
55

6-
"github.com/docker/docker/api/types"
76
"github.com/docker/docker/api/types/filters"
87
"github.com/docker/docker/api/types/swarm"
98
)
109

1110
// ServiceList returns Swarm services
1211
func (c *Client) ServiceList(filterArgs filters.Args) ([]swarm.Service, error) {
13-
services, err := c.API.ServiceList(c.ctx, types.ServiceListOptions{
12+
services, err := c.API.ServiceList(c.ctx, swarm.ServiceListOptions{
1413
Filters: filterArgs,
1514
})
1615
if err != nil {

0 commit comments

Comments
 (0)