ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-16 11:58:43 +00:00
Code Packages Projects Releases Wiki Activity

Fix crashes due to wrong names. (#1161)

Browse Source
This commit is contained in:
Felix Fontein 2025-10-11 15:29:14 +02:00 committed by GitHub
parent 892e9d9cbd
commit 33c8a49191
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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

@ -353,7 +353,7 @@ class Connection(ConnectionBase):
actual_user = self._get_docker_remote_user() actual_user = self._get_docker_remote_user()
if actual_user != self.get_option("remote_user"): if actual_user != self.get_option("remote_user"):
display.warning( display.warning(
f'docker {self.docker_version} does not support remote_user, using container default: {self.actual_user or "?"}' f'docker {self.docker_version} does not support remote_user, using container default: {actual_user or "?"}'
) )
return actual_user return actual_user
elif self._display.verbosity > 2: elif self._display.verbosity > 2:

2
plugins/modules/docker_compose_v2_exec.py
View File

@ -200,7 +200,7 @@ class ExecManager(BaseComposeManager):
self.argv = shlex.split(parameters["command"]) self.argv = shlex.split(parameters["command"])
if self.detach and self.stdin is not None: 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"]: if self.stdin is not None and parameters["stdin_add_newline"]:
self.stdin += "\n" self.stdin += "\n"

2
plugins/modules/docker_compose_v2_run.py
View File

@ -286,7 +286,7 @@ class ExecManager(BaseComposeManager):
self.argv = shlex.split(parameters["command"]) self.argv = shlex.split(parameters["command"])
if self.detach and self.stdin is not None: 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"]: if self.stdin is not None and parameters["stdin_add_newline"]:
self.stdin += "\n" self.stdin += "\n"