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

[stable-2] Make current_container_facts work with newer Docker versions and latest ansible-test container changes #512

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Backport of the bugfix part of #510 to stable-2.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

current_container_facts

…st ansible-test container changes (ansible-collections#510)

* Add more debug output.

* Add basic integration test.

* Split into lines.

* Fix docker detection, add podman detection.

ci_complete

* Improve regular expression.

* Document that this module is trying its best, but might not be perfect.

* Update comment.

(cherry picked from commit c2d84ef)
@github-actions
Copy link

github-actions bot commented Nov 30, 2022

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

Copy link

@kristianheljas kristianheljas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backport is functionally identical, good to go

@felixfontein felixfontein merged commit 3da9aa3 into ansible-collections:stable-2 Nov 30, 2022
@patchback
Copy link
Contributor

patchback bot commented Nov 30, 2022

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

❌ Failed to cleanly apply 3da9aa3 on top of patchback/backports/stable-1/3da9aa3b9c0b1fe166af16e090419fe5ca9feca5/pr-512

Backporting merged PR #512 into stable-2

  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-1/3da9aa3b9c0b1fe166af16e090419fe5ca9feca5/pr-512 upstream/stable-1
  4. Now, cherry-pick PR [stable-2] Make current_container_facts work with newer Docker versions and latest ansible-test container changes #512 contents into that branch:
    $ git cherry-pick -x 3da9aa3b9c0b1fe166af16e090419fe5ca9feca5
    If it'll yell at you with something like fatal: Commit 3da9aa3b9c0b1fe166af16e090419fe5ca9feca5 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 3da9aa3b9c0b1fe166af16e090419fe5ca9feca5
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR [stable-2] Make current_container_facts work with newer Docker versions and latest ansible-test container changes #512 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/3da9aa3b9c0b1fe166af16e090419fe5ca9feca5/pr-512
  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 current-container-stable2 branch November 30, 2022 22:01
@felixfontein
Copy link
Collaborator Author

@kristianheljas thanks for checking this one!

felixfontein added a commit that referenced this pull request Nov 30, 2022
…ns and latest ansible-test container changes (#512)

* Make current_container_facts work with newer Docker versions and latest ansible-test container changes (#510)

* Add more debug output.

* Add basic integration test.

* Split into lines.

* Fix docker detection, add podman detection.

ci_complete

* Improve regular expression.

* Document that this module is trying its best, but might not be perfect.

* Update comment.

(cherry picked from commit c2d84ef)

* Remove new feature (podman support).

(cherry picked from commit 3da9aa3)
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.

2 participants