From c1bc8302564de660f4cad47fe0e638c38ffac974 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 22 Nov 2021 20:06:41 +0100 Subject: [PATCH] Only pass chdir on when it is provided, and prevent this option from being used for Docker SDK for Python < 3.0.0. --- .../fragments/243-docker_container_exec-chdir.yml | 2 ++ plugins/modules/docker_container_exec.py | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/243-docker_container_exec-chdir.yml diff --git a/changelogs/fragments/243-docker_container_exec-chdir.yml b/changelogs/fragments/243-docker_container_exec-chdir.yml new file mode 100644 index 000000000..c4677e86b --- /dev/null +++ b/changelogs/fragments/243-docker_container_exec-chdir.yml @@ -0,0 +1,2 @@ +bugfixes: + - "docker_container_exec - ``chdir`` is only supported since Docker SDK for Python 3.0.0. Make sure that this option can only use when 3.0.0 or later is installed, and prevent passing this parameter on when ``chdir`` is not provided to this module (https://github.com/ansible-collections/community.docker/pull/243, https://github.com/ansible-collections/community.docker/issues/242)." diff --git a/plugins/modules/docker_container_exec.py b/plugins/modules/docker_container_exec.py index 8c930178f..90c6e30ac 100644 --- a/plugins/modules/docker_container_exec.py +++ b/plugins/modules/docker_container_exec.py @@ -163,8 +163,13 @@ def main(): tty=dict(type='bool', default=False), ) + option_minimal_versions = dict( + chdir=dict(docker_py_version='3.0.0'), + ) + client = AnsibleDockerClient( argument_spec=argument_spec, + option_minimal_versions=option_minimal_versions, min_docker_api_version='1.20', mutually_exclusive=[('argv', 'command')], required_one_of=[('argv', 'command')], @@ -190,6 +195,9 @@ def main(): selectors = find_selectors(client.module) try: + kwargs = {} + if chdir is not None: + kwargs['workdir'] = chdir exec_data = client.exec_create( container, argv, @@ -197,7 +205,7 @@ def main(): stderr=True, stdin=bool(stdin), user=user or '', - workdir=chdir, + **kwargs ) exec_id = exec_data['Id']