Skip to content

Work around Docker 29.0.0 CLI bug#1187

Merged
felixfontein merged 1 commit intoansible-collections:mainfrom
felixfontein:docker-fix
Nov 12, 2025
Merged

Work around Docker 29.0.0 CLI bug#1187
felixfontein merged 1 commit intoansible-collections:mainfrom
felixfontein:docker-fix

Conversation

@felixfontein
Copy link
Copy Markdown
Collaborator

SUMMARY

Fixes #1185.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

_common_cli module util

@felixfontein felixfontein added the backport-4 Automatically create a backport for the stable-3 branch label Nov 12, 2025
@felixfontein
Copy link
Copy Markdown
Collaborator Author

CI failures are unrelated to this PR. There seem to be further breaking changes in 29.0.0...

@felixfontein felixfontein merged commit ec14568 into ansible-collections:main Nov 12, 2025
75 of 94 checks passed
@patchback
Copy link
Copy Markdown
Contributor

patchback Bot commented Nov 12, 2025

Backport to stable-4: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply ec14568 on top of patchback/backports/stable-4/ec14568b22507dfcfdd9ce27fc05184d72c87c04/pr-1187

Backporting merged PR #1187 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.docker.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4/ec14568b22507dfcfdd9ce27fc05184d72c87c04/pr-1187 upstream/stable-4
  4. Now, cherry-pick PR Work around Docker 29.0.0 CLI bug #1187 contents into that branch:
    $ git cherry-pick -x ec14568b22507dfcfdd9ce27fc05184d72c87c04
    If it'll yell at you with something like fatal: Commit ec14568b22507dfcfdd9ce27fc05184d72c87c04 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x ec14568b22507dfcfdd9ce27fc05184d72c87c04
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Work around Docker 29.0.0 CLI bug #1187 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4/ec14568b22507dfcfdd9ce27fc05184d72c87c04/pr-1187
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-4 Automatically create a backport for the stable-3 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Breaking Key Change in Docker CLI Version Response

1 participant