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-1] docker connection plugin: fix config docs and update to use config system #313

Merged
merged 3 commits into from
Mar 24, 2022

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Backport of #297 to stable-1. Removes all 2.2.0 additions from its commit.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

docker connection plugin

bcoca and others added 2 commits March 21, 2022 21:35
…stem (ansible-collections#297)

* fix config docs and update to use config system

 wean off play_context which did not have the correct data in all cases

* moar fixes

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <[email protected]>

* updated for backwards compat

* badmergeresolution

* makeitworks

* attempt to fix unit test

* mocking it# No more than 50 chars. #### 50 chars is here: #

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <[email protected]>

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <[email protected]>

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <[email protected]>

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <[email protected]>

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <[email protected]>

* Update plugins/connection/docker.py

Co-authored-by: Felix Fontein <[email protected]>

* nomock

* remove bad paste

* properly load connection to initialize config

* initizlie docker args

* Fix bugs.

* Call _set_conn_data() when needed.

* Cache result of _get_docker_remote_user() now that it is called multiple times per task.

* Fix unit tests.

* list.clear() is Python 3...

* Add changelog.

* Call _set_conn_data() also in _connect().

Co-authored-by: Felix Fontein <[email protected]>
(cherry picked from commit 37a3264)
Copy link
Contributor

@briantist briantist left a comment

Choose a reason for hiding this comment

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

minor comment on the changelog but otherwise straightforward

@felixfontein felixfontein merged commit 30c00d4 into ansible-collections:stable-1 Mar 24, 2022
@felixfontein felixfontein deleted the stable-1-297 branch March 24, 2022 05:32
@felixfontein
Copy link
Collaborator Author

@briantist thanks for reviewing!

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.

3 participants