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_swarm: do not pass data_path_addr for older Docker SDK for Python versions #696

Merged
merged 1 commit into from
Oct 14, 2023

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Fixes #695.

CC @Hursofid

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

docker_swarm

@felixfontein felixfontein added the backport-2 Automatically create a backport for the stable-2 branch label Oct 14, 2023
@felixfontein felixfontein merged commit fbc2750 into ansible-collections:main Oct 14, 2023
97 checks passed
@patchback
Copy link

patchback bot commented Oct 14, 2023

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

❌ Failed to cleanly apply fbc2750 on top of patchback/backports/stable-2/fbc2750b6a83ba049839bd2b46b1900db14539e0/pr-696

Backporting merged PR #696 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/fbc2750b6a83ba049839bd2b46b1900db14539e0/pr-696 upstream/stable-2
  4. Now, cherry-pick PR docker_swarm: do not pass data_path_addr for older Docker SDK for Python versions #696 contents into that branch:
    $ git cherry-pick -x fbc2750b6a83ba049839bd2b46b1900db14539e0
    If it'll yell at you with something like fatal: Commit fbc2750b6a83ba049839bd2b46b1900db14539e0 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x fbc2750b6a83ba049839bd2b46b1900db14539e0
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR docker_swarm: do not pass data_path_addr for older Docker SDK for Python versions #696 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2/fbc2750b6a83ba049839bd2b46b1900db14539e0/pr-696
  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 swarm branch October 14, 2023 21:48
@felixfontein
Copy link
Collaborator Author

@briantist thanks a lot for reviewing this!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2 Automatically create a backport for the stable-2 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unable to init swarm
2 participants