docker connection plugin: fix config docs and update to use config system #297

bcoca · 2022-02-10T18:30:01Z

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

Fixes #307.

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

connection/docker.py

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

github-actions · 2022-02-10T18:31:42Z

Docs Build 📝

Thank you for contribution!✨

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

plugins/connection/docker.py

felixfontein · 2022-02-11T05:44:03Z

Hmm, one thing I'm wondering is whether this actually works with older versions of ansible-core than 2.13 / devel branch.

My main issue here are when values are specified as CLI args and task keywords. The old code should happily use such values as ansible-core somehow placed them in _play_context.

briantist · 2022-02-11T15:57:18Z

Does this change behavior because of ansible/ansible#73268 ?
As in, does getting the vars from _play_context give the result from processing templating, or does it (like current behavior) give you raw values without jinja processing?

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

bcoca · 2022-02-11T19:32:50Z

@briantist unrelated, you never get vars from play_context .. it does UPDATE the task variables with some 'connection vars' but not always correctly, specially in loop or delegation context (things i think we finally fixed in current devel)

lookups are normally in charge of templating their own vars, but config should be doing it for it in this case, so its a different bug, see my last comment in that ticket.

plugins/connection/docker.py

tests/unit/plugins/connection/test_docker.py

felixfontein · 2022-02-12T11:32:57Z

(If backported this needs to be done manually, if just to remove the new options.)

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

plugins/connection/docker.py

…ple times per task.

felixfontein

Looks good to me. @AlanCoding can you try again (just to make sure I didn't screw something up)? @bcoca can you also take a quick look? Thanks!

AlanCoding · 2022-03-18T12:54:51Z

👍 latest version of the plugin is working just fine as well.

bcoca · 2022-03-18T15:37:11Z

plugins/connection/docker.py

@@ -115,6 +115,7 @@ def __init__(self, play_context, new_stdin, *args, **kwargs):
        # root.

        self._docker_args = []
+        self._container_user_cache = {}


do not cache user as it is not guaranteed to be the same for all calls in the task

Do you mean that someone could recreate the container during the playbook/role run?

plugins/connection/docker.py

felixfontein · 2022-03-21T18:19:55Z

@bcoca thanks a lot for fixing this!
@fao89 @AlanCoding thanks for reviewing/testing!

…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)

…e config system (#313) * docker connection plugin: fix config docs and update to use config system (#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) * Remove 2.2.0 additions. * Remove unnecessary fragment, adjust URL. Co-authored-by: Brian Coca <[email protected]>

fix config docs and update to use config system

4cea44c

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

bcoca mentioned this pull request Feb 10, 2022

Error: No such container: inventory_hostname ansible/ansible#77001

Closed

1 task

fao89 approved these changes Feb 10, 2022

View reviewed changes

plugins/connection/docker.py Outdated Show resolved Hide resolved

moar fixes

9a63b3f

felixfontein reviewed Feb 11, 2022

View reviewed changes

plugins/connection/docker.py Outdated Show resolved Hide resolved

felixfontein added the backport-1 label Feb 11, 2022

Update plugins/connection/docker.py

a403292

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

bcoca added 5 commits February 11, 2022 15:04

updated for backwards compat

e8916c2

badmergeresolution

715ace2

makeitworks

de4a79b

attempt to fix unit test

37717fa

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

af610f3

felixfontein reviewed Feb 12, 2022

View reviewed changes

tests/unit/plugins/connection/test_docker.py Outdated Show resolved Hide resolved

felixfontein removed the backport-1 label Feb 12, 2022

bcoca and others added 9 commits February 14, 2022 09:50

Update plugins/connection/docker.py

116ae60

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

Update plugins/connection/docker.py

a53a975

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

Update plugins/connection/docker.py

f51504f

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

Update plugins/connection/docker.py

b70cff2

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

Update plugins/connection/docker.py

d927149

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

Update plugins/connection/docker.py

4eb3684

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

nomock

c56483b

remove bad paste

58a659b

properly load connection to initialize config

9905b40

felixfontein reviewed Feb 14, 2022

View reviewed changes

plugins/connection/docker.py Show resolved Hide resolved

felixfontein added 3 commits March 18, 2022 07:22

Cache result of _get_docker_remote_user() now that it is called multi…

243c933

…ple times per task.

Fix unit tests.

5bee73c

list.clear() is Python 3...

a526d68

felixfontein approved these changes Mar 18, 2022

View reviewed changes

bcoca commented Mar 18, 2022

View reviewed changes

plugins/connection/docker.py Show resolved Hide resolved

Add changelog.

ef0eaf9

felixfontein mentioned this pull request Mar 18, 2022

docker_api connection plugin: adjust to ansible-core 2.13 #308

Merged

felixfontein changed the title ~~fix config docs and update to use config system~~ docker connection plugin: fix config docs and update to use config system Mar 18, 2022

Call _set_conn_data() also in _connect().

82df729

felixfontein approved these changes Mar 21, 2022

View reviewed changes

felixfontein merged commit 37a3264 into ansible-collections:main Mar 21, 2022

felixfontein mentioned this pull request Mar 21, 2022

[stable-1] docker connection plugin: fix config docs and update to use config system #313

Merged

wyoa-bot bot mentioned this pull request Mar 28, 2022

feat(ansible): update dependency community.docker to v2.3.0 jr0dd/home-ops#969

Merged

1 task

felixfontein mentioned this pull request Mar 31, 2022

ansible_docker_extra_args is ignored by "Docker version check" #325

Closed

bcoca deleted the fix_conn_config branch April 1, 2022 13:26

renovate bot mentioned this pull request Apr 24, 2022

chore(deps): update community.docker to 2.6.0 - autoclosed xfgjdsytdsg/home-cluster#30

Closed

1 task

apatard mentioned this pull request Aug 24, 2022

Warning about improperly configured remote target containers/ansible-podman-collections#428

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

docker connection plugin: fix config docs and update to use config system #297

docker connection plugin: fix config docs and update to use config system #297

bcoca commented Feb 10, 2022 •

edited by felixfontein

Loading

github-actions bot commented Feb 10, 2022 •

edited

Loading

felixfontein commented Feb 11, 2022

briantist commented Feb 11, 2022

bcoca commented Feb 11, 2022 •

edited

Loading

felixfontein commented Feb 12, 2022

felixfontein left a comment

AlanCoding commented Mar 18, 2022

bcoca Mar 18, 2022

felixfontein Mar 18, 2022

felixfontein commented Mar 21, 2022

docker connection plugin: fix config docs and update to use config system #297

docker connection plugin: fix config docs and update to use config system #297

Conversation

bcoca commented Feb 10, 2022 • edited by felixfontein Loading

ISSUE TYPE

COMPONENT NAME

github-actions bot commented Feb 10, 2022 • edited Loading

Docs Build 📝

felixfontein commented Feb 11, 2022

briantist commented Feb 11, 2022

bcoca commented Feb 11, 2022 • edited Loading

felixfontein commented Feb 12, 2022

felixfontein left a comment

Choose a reason for hiding this comment

AlanCoding commented Mar 18, 2022

bcoca Mar 18, 2022

Choose a reason for hiding this comment

felixfontein Mar 18, 2022

Choose a reason for hiding this comment

felixfontein commented Mar 21, 2022

bcoca commented Feb 10, 2022 •

edited by felixfontein

Loading

github-actions bot commented Feb 10, 2022 •

edited

Loading

bcoca commented Feb 11, 2022 •

edited

Loading