Skip to content

Commit c3e0312

Browse files
chore: bump github.com/docker/docker from 25.0.13+incompatible to 28.5.1+incompatible (#750)
* chore: bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 25.0.13+incompatible to 28.5.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v25.0.13...v28.5.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-version: 28.5.1+incompatible dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * fix: docker breaking change --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Minh Vu <[email protected]> Co-authored-by: Minh Vu <[email protected]>
1 parent a422bf1 commit c3e0312

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

cmd/dockerlogger/dockerlogger.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"sync"
1111
"time"
1212

13-
"github.com/docker/docker/api/types"
1413
"github.com/docker/docker/api/types/container"
14+
"github.com/docker/docker/api/types/network"
1515
"github.com/docker/docker/client"
1616
"github.com/fatih/color"
1717
"github.com/spf13/cobra"
@@ -117,23 +117,23 @@ func CreateClient() (*client.Client, error) {
117117
}
118118

119119
// InspectNetwork retrieves detailed information about a Docker network.
120-
func InspectNetwork(ctx context.Context, cli *client.Client, networkName string) (types.NetworkResource, error) {
120+
func InspectNetwork(ctx context.Context, cli *client.Client, networkName string) (network.Inspect, error) {
121121
if networkName == "" {
122-
return types.NetworkResource{}, fmt.Errorf("network name cannot be empty")
122+
return network.Inspect{}, fmt.Errorf("network name cannot be empty")
123123
}
124124

125125
if cli == nil {
126-
return types.NetworkResource{}, fmt.Errorf("docker client cannot be nil")
126+
return network.Inspect{}, fmt.Errorf("docker client cannot be nil")
127127
}
128128

129-
network, err := cli.NetworkInspect(ctx, networkName, types.NetworkInspectOptions{
129+
net, err := cli.NetworkInspect(ctx, networkName, network.InspectOptions{
130130
Verbose: true,
131131
})
132132
if err != nil {
133-
return types.NetworkResource{}, fmt.Errorf("failed to inspect network %s: %w", networkName, err)
133+
return network.Inspect{}, fmt.Errorf("failed to inspect network %s: %w", networkName, err)
134134
}
135135

136-
return network, nil
136+
return net, nil
137137
}
138138

139139
func monitorLogs(ctx context.Context, cli *client.Client, networkName string, config *LogConfig) error {

go.mod

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ require (
4040
require github.com/alecthomas/participle/v2 v2.1.4
4141

4242
require (
43+
github.com/containerd/errdefs v1.0.0 // indirect
44+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
4345
github.com/containerd/log v0.1.0 // indirect
4446
github.com/crate-crypto/go-eth-kzg v1.3.0 // indirect
4547
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
@@ -50,6 +52,8 @@ require (
5052
github.com/gdamore/encoding v1.0.1 // indirect
5153
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
5254
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
55+
github.com/moby/docker-image-spec v1.3.1 // indirect
56+
github.com/moby/sys/atomicwriter v0.1.0 // indirect
5357
github.com/morikuni/aec v1.0.0 // indirect
5458
github.com/opencontainers/go-digest v1.0.0 // indirect
5559
github.com/opencontainers/image-spec v1.1.1 // indirect
@@ -162,7 +166,7 @@ require (
162166
cloud.google.com/go/kms v1.23.2
163167
github.com/0xPolygon/cdk-contracts-tooling v0.0.1
164168
github.com/cometbft/cometbft v0.38.19
165-
github.com/docker/docker v25.0.13+incompatible
169+
github.com/docker/docker v28.5.1+incompatible
166170
github.com/fatih/color v1.18.0
167171
github.com/gateway-fm/vectorized-poseidon-gold v1.0.0
168172
github.com/gdamore/tcell/v2 v2.9.0

go.sum

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ github.com/consensys/bavard v0.1.27 h1:j6hKUrGAy/H+gpNrpLU3I26n1yc+VMGmd6ID5+gAh
110110
github.com/consensys/bavard v0.1.27/go.mod h1:k/zVjHHC4B+PQy1Pg7fgvG3ALicQw540Crag8qx+dZs=
111111
github.com/consensys/gnark-crypto v0.16.0 h1:8Dl4eYmUWK9WmlP1Bj6je688gBRJCJbT8Mw4KoTAawo=
112112
github.com/consensys/gnark-crypto v0.16.0/go.mod h1:Ke3j06ndtPTVvo++PhGNgvm+lgpLvzbcE2MqljY7diU=
113+
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
114+
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
115+
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
116+
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
113117
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
114118
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
115119
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
@@ -146,8 +150,8 @@ github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WA
146150
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
147151
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
148152
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
149-
github.com/docker/docker v25.0.13+incompatible h1:YeBrkUd3q0ZoRDNoEzuopwCLU+uD8GZahDHwBdsTnkU=
150-
github.com/docker/docker v25.0.13+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
153+
github.com/docker/docker v28.5.1+incompatible h1:Bm8DchhSD2J6PsFzxC35TZo4TLGR2PdW/E69rU45NhM=
154+
github.com/docker/docker v28.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
151155
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
152156
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
153157
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -358,6 +362,12 @@ github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8oh
358362
github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY=
359363
github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU=
360364
github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
365+
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
366+
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
367+
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
368+
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
369+
github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
370+
github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
361371
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA=
362372
github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
363373
github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=

0 commit comments

Comments
 (0)