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 SDK for Python 7+: make sure that tls_hostname is not passed, and error out if it was explicitly set #721

Merged
merged 1 commit into from
Dec 9, 2023

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

It was removed in docker/docker-py#3185 as well, next to ssl_version.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

common module utils

@felixfontein felixfontein merged commit 2677230 into ansible-collections:main Dec 9, 2023
121 checks passed
@felixfontein felixfontein deleted the tls-hostname branch December 9, 2023 22:16
Copy link
Contributor

patchback bot commented Dec 9, 2023

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

❌ Failed to cleanly apply 2677230 on top of patchback/backports/stable-2/26772304f999c2d8b673523908c38fd1846b4596/pr-721

Backporting merged PR #721 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/26772304f999c2d8b673523908c38fd1846b4596/pr-721 upstream/stable-2
  4. Now, cherry-pick PR Docker SDK for Python 7+: make sure that tls_hostname is not passed, and error out if it was explicitly set #721 contents into that branch:
    $ git cherry-pick -x 26772304f999c2d8b673523908c38fd1846b4596
    If it'll yell at you with something like fatal: Commit 26772304f999c2d8b673523908c38fd1846b4596 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 26772304f999c2d8b673523908c38fd1846b4596
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Docker SDK for Python 7+: make sure that tls_hostname is not passed, and error out if it was explicitly set #721 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2/26772304f999c2d8b673523908c38fd1846b4596/pr-721
  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 added a commit to felixfontein/community.docker that referenced this pull request Dec 9, 2023
felixfontein added a commit that referenced this pull request Dec 9, 2023
…ot passed, and error out if it was explicitly set (#723)

* Do not accept tls_hostname for Docker SDK for Python 7.0.0+. (#721)

(cherry picked from commit 2677230)

* Ignore the value 'localhost', which appens to be the default for this option.
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