Skip to content

Commit 65ea7d4

Browse files
mergify[bot]dependabot[bot]pchilamichel-laterman
authored
[8.18](backport #5408) build(deps): bump github.com/docker/docker from 28.3.3+incompatible to 28.4.0+incompatible in /testing (#5410)
* build(deps): bump github.com/docker/docker in /testing (#5408) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 28.3.3+incompatible to 28.4.0+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v28.3.3...v28.4.0) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-version: 28.4.0+incompatible dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit dfd376b) # Conflicts: # testing/go.mod # testing/go.sum * fix conflicts * bump testcontainers testing dependency * fixup! bump testcontainers testing dependency --------- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Paolo Chila <[email protected]> Co-authored-by: Michel Laterman <[email protected]>
1 parent 1003819 commit 65ea7d4

File tree

2 files changed

+65
-101
lines changed

2 files changed

+65
-101
lines changed

testing/go.mod

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,68 +9,70 @@ replace (
99

1010
require (
1111
github.com/Shopify/toxiproxy v2.1.4+incompatible
12-
github.com/docker/docker v26.1.5+incompatible
12+
github.com/docker/docker v28.4.0+incompatible
1313
github.com/elastic/elastic-agent-client/v7 v7.17.2
1414
github.com/elastic/fleet-server/pkg/api v0.0.0-00010101000000-000000000000
1515
github.com/elastic/fleet-server/v7 v7.0.0-00010101000000-000000000000
1616
github.com/stretchr/testify v1.11.1
17-
github.com/testcontainers/testcontainers-go v0.31.0
17+
github.com/testcontainers/testcontainers-go v0.38.0
1818
)
1919

2020
require (
21-
dario.cat/mergo v1.0.0 // indirect
21+
dario.cat/mergo v1.0.1 // indirect
2222
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
23-
github.com/Microsoft/go-winio v0.6.1 // indirect
24-
github.com/Microsoft/hcsshim v0.11.4 // indirect
23+
github.com/Microsoft/go-winio v0.6.2 // indirect
2524
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
2625
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
27-
github.com/containerd/containerd v1.7.15 // indirect
26+
github.com/containerd/errdefs v1.0.0 // indirect
27+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
2828
github.com/containerd/log v0.1.0 // indirect
29-
github.com/cpuguy83/dockercfg v0.3.1 // indirect
29+
github.com/containerd/platforms v0.2.1 // indirect
30+
github.com/cpuguy83/dockercfg v0.3.2 // indirect
3031
github.com/davecgh/go-spew v1.1.1 // indirect
31-
github.com/distribution/reference v0.5.0 // indirect
32+
github.com/distribution/reference v0.6.0 // indirect
3233
github.com/docker/go-connections v0.5.0 // indirect
3334
github.com/docker/go-units v0.5.0 // indirect
35+
github.com/ebitengine/purego v0.8.4 // indirect
3436
github.com/elastic/elastic-agent-libs v0.23.1 // indirect
3537
github.com/felixge/httpsnoop v1.0.4 // indirect
3638
github.com/go-logr/logr v1.4.3 // indirect
3739
github.com/go-logr/stdr v1.2.2 // indirect
3840
github.com/go-ole/go-ole v1.3.0 // indirect
39-
github.com/gogo/protobuf v1.3.2 // indirect
4041
github.com/google/uuid v1.6.0 // indirect
41-
github.com/klauspost/compress v1.17.11 // indirect
42+
github.com/klauspost/compress v1.18.0 // indirect
4243
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
43-
github.com/magiconair/properties v1.8.7 // indirect
44+
github.com/magiconair/properties v1.8.10 // indirect
4445
github.com/moby/docker-image-spec v1.3.1 // indirect
46+
github.com/moby/go-archive v0.1.0 // indirect
4547
github.com/moby/patternmatcher v0.6.0 // indirect
46-
github.com/moby/sys/sequential v0.5.0 // indirect
47-
github.com/moby/sys/user v0.1.0 // indirect
48+
github.com/moby/sys/sequential v0.6.0 // indirect
49+
github.com/moby/sys/user v0.4.0 // indirect
50+
github.com/moby/sys/userns v0.1.0 // indirect
4851
github.com/moby/term v0.5.0 // indirect
4952
github.com/morikuni/aec v1.0.0 // indirect
5053
github.com/oapi-codegen/runtime v1.1.1 // indirect
5154
github.com/opencontainers/go-digest v1.0.0 // indirect
52-
github.com/opencontainers/image-spec v1.1.0 // indirect
55+
github.com/opencontainers/image-spec v1.1.1 // indirect
5356
github.com/pkg/errors v0.9.1 // indirect
5457
github.com/pmezard/go-difflib v1.0.0 // indirect
5558
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
56-
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
57-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
59+
github.com/shirou/gopsutil/v4 v4.25.5 // indirect
5860
github.com/sirupsen/logrus v1.9.3 // indirect
5961
github.com/tklauser/go-sysconf v0.3.12 // indirect
6062
github.com/tklauser/numcpus v0.6.1 // indirect
6163
github.com/yusufpapurcu/wmi v1.2.4 // indirect
6264
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
6365
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
6466
go.opentelemetry.io/otel v1.37.0 // indirect
67+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
6568
go.opentelemetry.io/otel/metric v1.37.0 // indirect
6669
go.opentelemetry.io/otel/trace v1.37.0 // indirect
70+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
6771
golang.org/x/crypto v0.39.0 // indirect
68-
golang.org/x/mod v0.25.0 // indirect
6972
golang.org/x/net v0.41.0 // indirect
70-
golang.org/x/sync v0.15.0 // indirect
7173
golang.org/x/sys v0.33.0 // indirect
7274
golang.org/x/text v0.26.0 // indirect
73-
golang.org/x/tools v0.33.0 // indirect
75+
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
7476
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
7577
google.golang.org/grpc v1.75.0 // indirect
7678
google.golang.org/protobuf v1.36.8 // indirect

0 commit comments

Comments
 (0)