diff --git a/changelogs/fragments/1161-fix.yml b/changelogs/fragments/1161-fix.yml new file mode 100644 index 00000000..a7446de4 --- /dev/null +++ b/changelogs/fragments/1161-fix.yml @@ -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)." diff --git a/plugins/connection/docker.py b/plugins/connection/docker.py index 8fd86f88..f4b8ce4e 100644 --- a/plugins/connection/docker.py +++ b/plugins/connection/docker.py @@ -320,7 +320,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 diff --git a/plugins/modules/docker_compose_v2_exec.py b/plugins/modules/docker_compose_v2_exec.py index 13fcab0c..e7eead9d 100644 --- a/plugins/modules/docker_compose_v2_exec.py +++ b/plugins/modules/docker_compose_v2_exec.py @@ -203,7 +203,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' diff --git a/plugins/modules/docker_compose_v2_run.py b/plugins/modules/docker_compose_v2_run.py index b9352404..a02666cb 100644 --- a/plugins/modules/docker_compose_v2_run.py +++ b/plugins/modules/docker_compose_v2_run.py @@ -289,7 +289,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'