Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker_image: fix archive idempotency #765

Merged
merged 1 commit into from
Jan 20, 2024

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Docker API 1.44 broke the way the image ID needs to be extracted.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

docker_image

@felixfontein felixfontein merged commit ac41379 into ansible-collections:main Jan 20, 2024
122 of 123 checks passed
Copy link
Contributor

patchback bot commented Jan 20, 2024

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

❌ Failed to cleanly apply ac41379 on top of patchback/backports/stable-2/ac41379119817274c63801390f0f3001393c795d/pr-765

Backporting merged PR #765 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-2/ac41379119817274c63801390f0f3001393c795d/pr-765 upstream/stable-2
  4. Now, cherry-pick PR docker_image: fix archive idempotency #765 contents into that branch:
    $ git cherry-pick -x ac41379119817274c63801390f0f3001393c795d
    If it'll yell at you with something like fatal: Commit ac41379119817274c63801390f0f3001393c795d is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x ac41379119817274c63801390f0f3001393c795d
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR docker_image: fix archive idempotency #765 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2/ac41379119817274c63801390f0f3001393c795d/pr-765
  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.

@felixfontein felixfontein deleted the image-archive branch January 20, 2024 13:12
Copy link

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and the docs are now incorporated into main:
https://ansible-collections.github.io/community.docker/branch/main

@felixfontein
Copy link
Collaborator Author

stable-2 doesn't have this code, so no need to backport...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant