ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-03-15 19:58:28 +00:00
Code Packages Projects Releases Wiki Activity

Fix crashes due to wrong names. (#1161) (#1163)

Browse Source 
(cherry picked from commit 33c8a49191)
(cherry picked from commit b058cd40da)
This commit is contained in:
Felix Fontein 2025-10-11 15:54:51 +02:00 committed by patchback[bot]
parent 3789ea1612
commit 07bf249621
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelogs/fragments/1161-fix.yml Normal file
View File

@ -0,0 +1,4 @@
bugfixes:
- "docker connection plugin - fix crash instead of warning if Docker version does not support ``remote_user`` (https://github.com/ansible-collections/community.docker/pull/1161)."
- "docker_compose_v2_exec - fix crash instead of reporting error if ``detach=true`` and ``stdin`` is provided (https://github.com/ansible-collections/community.docker/pull/1161)."
- "docker_compose_v2_run - fix crash instead of reporting error if ``detach=true`` and ``stdin`` is provided (https://github.com/ansible-collections/community.docker/pull/1161)."

2
plugins/connection/docker.py
View File

@ -330,7 +330,7 @@ class Connection(ConnectionBase):
actual_user = self._get_docker_remote_user()
if actual_user != self.get_option('remote_user'):
display.warning(u'docker {0} does not support remote_user, using container default: {1}'
.format(self.docker_version, self.actual_user or u'?'))
.format(self.docker_version, actual_user or u'?'))
return actual_user
elif self._display.verbosity > 2:
# Since we are not setting the actual_user, look it up so we have it for logging later

2
plugins/modules/docker_compose_v2_exec.py
View File

@ -199,7 +199,7 @@ class ExecManager(BaseComposeManager):
self.argv = shlex.split(parameters['command'])
if self.detach and self.stdin is not None:
self.mail('If detach=true, stdin cannot be provided.')
self.fail('If detach=true, stdin cannot be provided.')
if self.stdin is not None and parameters['stdin_add_newline']:
self.stdin += '\n'

2
plugins/modules/docker_compose_v2_run.py
View File

@ -283,7 +283,7 @@ class ExecManager(BaseComposeManager):
self.argv = shlex.split(parameters['command'])
if self.detach and self.stdin is not None:
self.mail('If detach=true, stdin cannot be provided.')
self.fail('If detach=true, stdin cannot be provided.')
if self.stdin is not None and parameters['stdin_add_newline']:
self.stdin += '\n'