Skip to content

Commit 3e3093f

Browse files
HadrienPattetklauser
HadrienPatte
authored and
tklauser
committed
tester: Update docker/docker module to v28.3.3
Both dependabot (#380) and renovate (#381) tried to update `docker/docker` to v28 but there's some incompatibility between that module and the version of `google/go-containerregistry` currently used here so they both need to be updated. I ran: ``` go get github.com/docker/docker@v28.3.3 go get github.com/google/go-containerregistry@v0.20.6 go mod tidy ``` Signed-off-by: Hadrien Patte <hadrien.patte@datadoghq.com>
1 parent b6afb9d commit 3e3093f

2 files changed

Lines changed: 105 additions & 90 deletions

File tree

‎images/tester/cst/go.mod‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cilium/image-tools/images/tester/cst
22

3-
go 1.23.0
3+
go 1.24
44

55
toolchain go1.24.7
66

@@ -9,47 +9,55 @@ require github.com/GoogleContainerTools/container-structure-test v1.19.3
99
require (
1010
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
1111
github.com/Microsoft/go-winio v0.6.2 // indirect
12-
github.com/containerd/containerd v1.7.27 // indirect
12+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
13+
github.com/containerd/errdefs v1.0.0 // indirect
14+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
1315
github.com/containerd/log v0.1.0 // indirect
14-
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
16+
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
1517
github.com/distribution/reference v0.6.0 // indirect
16-
github.com/docker/cli v25.0.3+incompatible // indirect
18+
github.com/docker/cli v28.2.2+incompatible // indirect
1719
github.com/docker/distribution v2.8.3+incompatible // indirect
18-
github.com/docker/docker v27.1.1+incompatible // indirect
19-
github.com/docker/docker-credential-helpers v0.8.1 // indirect
20+
github.com/docker/docker v28.3.3+incompatible // indirect
21+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
2022
github.com/docker/go-connections v0.5.0 // indirect
2123
github.com/docker/go-units v0.5.0 // indirect
2224
github.com/felixge/httpsnoop v1.0.4 // indirect
2325
github.com/fsouza/go-dockerclient v1.11.2 // indirect
24-
github.com/go-logr/logr v1.4.2 // indirect
26+
github.com/go-logr/logr v1.4.3 // indirect
2527
github.com/go-logr/stdr v1.2.2 // indirect
2628
github.com/gogo/protobuf v1.3.2 // indirect
27-
github.com/google/go-containerregistry v0.20.1 // indirect
29+
github.com/google/go-containerregistry v0.20.6 // indirect
2830
github.com/joho/godotenv v1.5.1 // indirect
29-
github.com/klauspost/compress v1.17.7 // indirect
30-
github.com/kr/pretty v0.3.1 // indirect
31+
github.com/klauspost/compress v1.18.0 // indirect
3132
github.com/mitchellh/go-homedir v1.1.0 // indirect
3233
github.com/moby/docker-image-spec v1.3.1 // indirect
34+
github.com/moby/go-archive v0.1.0 // indirect
3335
github.com/moby/patternmatcher v0.6.0 // indirect
3436
github.com/moby/sys/sequential v0.6.0 // indirect
35-
github.com/moby/sys/user v0.3.0 // indirect
37+
github.com/moby/sys/user v0.4.0 // indirect
3638
github.com/moby/sys/userns v0.1.0 // indirect
3739
github.com/moby/term v0.5.0 // indirect
3840
github.com/morikuni/aec v1.0.0 // indirect
3941
github.com/opencontainers/go-digest v1.0.0 // indirect
40-
github.com/opencontainers/image-spec v1.1.0 // indirect
42+
github.com/opencontainers/image-spec v1.1.1 // indirect
4143
github.com/pkg/errors v0.9.1 // indirect
4244
github.com/sirupsen/logrus v1.9.3 // indirect
43-
github.com/vbatts/tar-split v0.11.5 // indirect
44-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
45-
go.opentelemetry.io/otel v1.24.0 // indirect
46-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
47-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
45+
github.com/vbatts/tar-split v0.12.1 // indirect
46+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
47+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
48+
go.opentelemetry.io/otel v1.37.0 // indirect
49+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
50+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
51+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
52+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
4853
golang.org/x/crypto v0.35.0 // indirect
49-
golang.org/x/sync v0.10.0 // indirect
50-
golang.org/x/sys v0.30.0 // indirect
54+
golang.org/x/net v0.33.0 // indirect
55+
golang.org/x/sync v0.15.0 // indirect
56+
golang.org/x/sys v0.33.0 // indirect
5157
golang.org/x/term v0.29.0 // indirect
52-
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
53-
google.golang.org/grpc v1.62.1 // indirect
58+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
59+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
60+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
61+
google.golang.org/grpc v1.68.1 // indirect
5462
gopkg.in/yaml.v2 v2.4.0 // indirect
5563
)

0 commit comments

Comments
 (0)