chore(deps)!: bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible by mdelapenya · Pull Request #3194 · testcontainers/testcontainers-go

mdelapenya · 2025-06-02T04:25:02Z

This PR represents a Breaking Change as, before these changs, we were using deprecated types as part of the build image signatures:

I.e., implementers of the ImageBuildInfo interface, would see that BuildOptions has changed its signature.

type ImageBuildInfo interface {
- 	 BuildOptions() (types.ImageBuildOptions, error) // converts the ImageBuildInfo to a types.ImageBuildOptions
+        BuildOptions() (build.ImageBuildOptions, error) // converts the ImageBuildInfo to a build.ImageBuildOptions

Or, those using the FromDockerfile struct, its BuildOptionsModifier fields has changed:

- BuildOptionsModifier func(*types.ImageBuildOptions)
+ BuildOptionsModifier func(*build.ImageBuildOptions)

Note

This PR has been created with the combine-prs gh extension:

gh combine-prs --query author:app/dependabot --interactive --verbose --skip-pr-check.

It combines the following PRs:

chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/vearch (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/vearch #3193) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/vault (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/vault #3192) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/registry (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/registry #3191) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/redpanda (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/redpanda #3190) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/pulsar (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/pulsar #3189) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/opensearch (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/opensearch #3188) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/ollama (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/ollama #3187) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/localstack (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/localstack #3186) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/k6 (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/k6 #3185) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/k3s (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/k3s #3184) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/etcd (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/etcd #3183) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/dind (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/dind #3182) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/compose (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible in /modules/compose #3181) @app/dependabot
chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible (chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible #3180) @app/dependabot

Related Issues:

Bumps [github.com/docker/docker](https://github.com/docker/docker) from 28.1.1+incompatible to 28.2.2+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](moby/moby@v28.1.1...v28.2.2) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-version: 28.2.2+incompatible dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…ocker-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/vault/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/vault

…r/docker-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/registry/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/registry

…r/docker-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/redpanda/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/redpanda

…docker-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/pulsar/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/pulsar

…ker/docker-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/opensearch/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/opensearch

…docker-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/ollama/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/ollama

…ker/docker-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/localstack/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/localstack

…er-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/k6/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/k6

…ker-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/k3s/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/k3s

…cker-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/etcd/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/etcd

…cker-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/dind/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/dind

…/docker-28.2.2incompatible' into combined-pr-branch-388977541 * dependabot/go_modules/modules/compose/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker in /modules/compose

…compatible' into combined-pr-branch-388977541 * dependabot/go_modules/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker

netlify · 2025-06-02T04:25:07Z

✅ Deploy Preview for testcontainers-go ready!

Name	Link
🔨 Latest commit	`e9a58ad`
🔍 Latest deploy log	https://app.netlify.com/projects/testcontainers-go/deploys/683d6dca9867e9000814d957
😎 Deploy Preview	https://deploy-preview-3194--testcontainers-go.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

mdelapenya · 2025-06-02T08:32:38Z

testing_test.go

 		"join-other": {
 			err:  errors.Join(nil, notFoundError{}, errors.New("other")),
-			want: false,
+			want: true,


@stevenh I'm not sure, but this PR unveiled these test errors 🤔 Do you think we were having a false sense of security with them? Changing the assertion fixed them, and reading the specs for the modified tests makes me think they are correct now: a joined error including notFound should be captured as want:true, shouldn't it?

Merging, we can discuss about this in a follow up

* main: feat!: add options when creating RawCommand (testcontainers#3168) chore(deps)!: bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible (testcontainers#3194) feat(couchbase): adding auth to couchbase initCluster functions to support container reuse (testcontainers#3048) chore(deps): bump github.com/containerd/containerd/v2 (testcontainers#3167)

* main: (236 commits) feat(kafka,redpanda): support for waiting for mapped ports without external checks (testcontainers#3165) chore: bump ryuk to 0.12.0 (testcontainers#3195) feat!: add options when creating RawCommand (testcontainers#3168) chore(deps)!: bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible (testcontainers#3194) feat(couchbase): adding auth to couchbase initCluster functions to support container reuse (testcontainers#3048) chore(deps): bump github.com/containerd/containerd/v2 (testcontainers#3167) docs(options): refactor options layout in modules (testcontainers#3163) fix(ci): do not run sonar for Testcontainers Cloud (testcontainers#3166) chore(ci): do not fail fast in the Testcontainers Cloud run (testcontainers#3164) feat: support adding wait strategies as functional option (testcontainers#3161) fix(etcd): expose ports for the etcd nodes (testcontainers#3162) fix(wait): no port to wait for (testcontainers#3158) feat: add more functional options for customising containers (testcontainers#3156) docs(redpanda): update sasl authentication option to use scram sha 256 (testcontainers#3126) chore(deps): bump mkdocs-include-markdown-plugin from 6.2.2 to 7.1.5 (testcontainers#3137) chore(deps): bump github.com/shirou/gopsutil/v4 from 4.25.1 to 4.25.4 (testcontainers#3133) chore(deps): bump github.com/docker/docker from 28.0.1+incompatible to 28.1.1+incompatible (testcontainers#3152) feat(memcached): add memcached module (testcontainers#3132) fix(etcd): single node etcd cluster access (testcontainers#3149) feat(valkey): add TLS support for Valkey (testcontainers#3131) ...

…dition Update testcontainers-go to commit 1720acdcb24ef79dd34188da22da05e6cf72773c which includes the fix from testcontainers/testcontainers-go#3194 Background: Docker API changes in moby/moby#50030 affected how errdefs.ErrConflict errors are handled, causing testcontainers-go's isCleanupSafe function to no longer properly detect "already in progress" container removal errors. This resulted in test failures with messages like: "terminate: Error response from daemon: removal of container X is already in progress" The fix in testcontainers-go PR aquasecurity#3194 addresses this issue by updating the error handling logic to properly catch these Docker API error changes. Since this fix is not yet released, we use the specific commit hash. This resolves container cleanup race conditions in integration tests, particularly affecting TestContainerd_LocalImage and TestClientServerWithRedis.

dependabot bot and others added 28 commits June 1, 2025 11:52

Merge branch 'dependabot/go_modules/github.com/docker/docker-28.2.2in…

5b9849d

…compatible' into combined-pr-branch-388977541 * dependabot/go_modules/github.com/docker/docker-28.2.2incompatible: chore(deps): bump github.com/docker/docker

chore: run mod tidy

f1ce58d

mdelapenya self-assigned this Jun 2, 2025

mdelapenya requested a review from a team as a code owner June 2, 2025 04:25

mdelapenya added the chore Changes that do not impact the existing functionality label Jun 2, 2025

mdelapenya added 2 commits June 2, 2025 06:33

chore: use containerd's errdefs package

1305c99

break: use non deprecated types

a26d66c

mdelapenya changed the title ~~chore(deps): bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible~~ chore(deps)!: bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible Jun 2, 2025

mdelapenya added 3 commits June 2, 2025 08:01

fix: use containerd/errdefs in testing helpers

fcc9d09

fix: typo

7990afa

fix: update test

619e1e2

mdelapenya commented Jun 2, 2025

View reviewed changes

mdelapenya added 2 commits June 2, 2025 11:08

chore: using the new package elsewhere

032dc30

fix: lint

e9a58ad

mdelapenya added dependencies Dependencies or external services breaking change Causing compatibility issues. and removed chore Changes that do not impact the existing functionality labels Jun 2, 2025

mdelapenya merged commit 1720acd into testcontainers:main Jun 2, 2025
396 of 398 checks passed

mdelapenya deleted the combined-pr-branch-388977541 branch June 2, 2025 10:51

knqyf263 mentioned this pull request Jun 18, 2025

chore(deps): update Docker to v28.2.2 and fix compatibility issues aquasecurity/trivy#9037

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore(deps)!: bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible#3194

chore(deps)!: bump github.com/docker/docker from 28.1.1+incompatible to 28.2.2+incompatible#3194
mdelapenya merged 35 commits intotestcontainers:mainfrom
mdelapenya:combined-pr-branch-388977541

mdelapenya commented Jun 2, 2025 •

edited

Loading

Uh oh!

netlify bot commented Jun 2, 2025 •

edited

Loading

Uh oh!

mdelapenya Jun 2, 2025 •

edited

Loading

Uh oh!

mdelapenya Jun 2, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

mdelapenya commented Jun 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Related Issues:

Uh oh!

netlify bot commented Jun 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for testcontainers-go ready!

Uh oh!

mdelapenya Jun 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mdelapenya Jun 2, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

mdelapenya commented Jun 2, 2025 •

edited

Loading

netlify bot commented Jun 2, 2025 •

edited

Loading

mdelapenya Jun 2, 2025 •

edited

Loading