Skip to content

Commit 49ea898

Browse files
build(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.1+incompatible in /testing (#4988)
* build(deps): bump github.com/docker/docker in /testing Bumps [github.com/docker/docker](https://github.com/docker/docker) from 28.1.1+incompatible to 28.2.1+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v28.1.1...v28.2.1) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-version: 28.2.1+incompatible dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Remove toxi container name * Add retry for toxiproxy container --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: michel-laterman <michel.laterman@elastic.co>
1 parent d82fa5d commit 49ea898

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

testing/e2e/scaffold/scaffold.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,17 +520,30 @@ func (l *logger) Printf(format string, v ...interface{}) {
520520

521521
func (s *Scaffold) StartToxiproxy(ctx context.Context) *toxitc.Container {
522522
container, err := toxitc.Run(ctx, "ghcr.io/shopify/toxiproxy:2.12.0",
523+
testcontainers.WithLogger(&logger{s.T()}),
523524
testcontainers.CustomizeRequest(testcontainers.GenericContainerRequest{
524525
ContainerRequest: testcontainers.ContainerRequest{
525526
Hostname: "toxi",
526-
Name: "toxi",
527527
// Network is set to the integration test network instead of using host mode so it can easily communicate with other containers.
528528
// NOTE: the container will not become healthy when using `testcontainers-go 0.36.x+ if set to NetworkMode: "host"
529529
Networks: []string{"integration_default"},
530530
}}),
531-
testcontainers.WithLogger(&logger{s.T()}),
532531
toxitc.WithProxy("es", "elasticsearch:9200"),
533532
)
533+
if err != nil {
534+
s.T().Logf("Toxiproxy container creation failed, will retry: %v", err)
535+
container, err = toxitc.Run(ctx, "ghcr.io/shopify/toxiproxy:2.12.0",
536+
testcontainers.WithLogger(&logger{s.T()}),
537+
testcontainers.CustomizeRequest(testcontainers.GenericContainerRequest{
538+
ContainerRequest: testcontainers.ContainerRequest{
539+
Hostname: "toxi",
540+
// Network is set to the integration test network instead of using host mode so it can easily communicate with other containers.
541+
// NOTE: the container will not become healthy when using `testcontainers-go 0.36.x+ if set to NetworkMode: "host"
542+
Networks: []string{"integration_default"},
543+
}}),
544+
toxitc.WithProxy("es", "elasticsearch:9200"),
545+
)
546+
}
534547
s.Require().NoError(err)
535548

536549
s.T().Cleanup(func() {

testing/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ replace (
99

1010
require (
1111
github.com/Shopify/toxiproxy/v2 v2.12.0
12-
github.com/docker/docker v28.1.1+incompatible
12+
github.com/docker/docker v28.2.1+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
@@ -24,6 +24,8 @@ require (
2424
github.com/Microsoft/go-winio v0.6.2 // indirect
2525
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
2626
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
27+
github.com/containerd/errdefs v1.0.0 // indirect
28+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
2729
github.com/containerd/log v0.1.0 // indirect
2830
github.com/containerd/platforms v0.2.1 // indirect
2931
github.com/cpuguy83/dockercfg v0.3.2 // indirect

testing/go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3
1818
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
1919
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
2020
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
21+
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
22+
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
23+
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
24+
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
2125
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
2226
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
2327
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
@@ -33,8 +37,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
3337
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
3438
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
3539
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
36-
github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=
37-
github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
40+
github.com/docker/docker v28.2.1+incompatible h1:aTSWVTDStpHbnRu0xBcGoJEjRf5EQKt6nik6Vif8sWw=
41+
github.com/docker/docker v28.2.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
3842
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
3943
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
4044
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=

0 commit comments

Comments
 (0)