From 859bc29f9e724a5d77960e6c904e3ec15b9d2eb5 Mon Sep 17 00:00:00 2001 From: "Alexandr N. Zamaraev" Date: Tue, 4 May 2021 12:53:38 +0700 Subject: [PATCH] docker_compose: fix #12 (#119) * fix #12 * Create 12-correct_pull_wo_starting.yaml * Update changelogs/fragments/12-correct_pull_wo_starting.yaml Co-authored-by: Felix Fontein * Update changelogs/fragments/12-correct_pull_wo_starting.yaml Co-authored-by: Amin Vakil * Update docker_compose.py Co-authored-by: Felix Fontein Co-authored-by: Amin Vakil --- changelogs/fragments/12-correct_pull_wo_starting.yaml | 2 ++ plugins/modules/docker_compose.py | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/12-correct_pull_wo_starting.yaml diff --git a/changelogs/fragments/12-correct_pull_wo_starting.yaml b/changelogs/fragments/12-correct_pull_wo_starting.yaml new file mode 100644 index 000000000..2082ba6c5 --- /dev/null +++ b/changelogs/fragments/12-correct_pull_wo_starting.yaml @@ -0,0 +1,2 @@ +bugfixes: +- "docker-compose - fix not pulling when ``state: present`` and ``stopped: true`` (https://github.com/ansible-collections/community.docker/issues/12, https://github.com/ansible-collections/community.docker/pull/119)." diff --git a/plugins/modules/docker_compose.py b/plugins/modules/docker_compose.py index 7eaba417e..5a4837a08 100644 --- a/plugins/modules/docker_compose.py +++ b/plugins/modules/docker_compose.py @@ -772,7 +772,7 @@ def cmd_up(self): )) result['actions'].append(result_action) - if not self.check_mode and result['changed'] and not self.stopped: + if not self.check_mode and result['changed']: out_redir_name, err_redir_name = make_redirection_tempfiles() try: with stdout_redirector(out_redir_name): @@ -786,7 +786,8 @@ def cmd_up(self): do_build=do_build, detached=detached, remove_orphans=self.remove_orphans, - timeout=self.timeout) + timeout=self.timeout, + start=not self.stopped) except Exception as exc: fail_reason = get_failure_info(exc, out_redir_name, err_redir_name, msg_format="Error starting project %s") @@ -796,7 +797,7 @@ def cmd_up(self): if self.stopped: stop_output = self.cmd_stop(service_names) - result['changed'] = stop_output['changed'] + result['changed'] |= stop_output['changed'] result['actions'] += stop_output['actions'] if self.restarted: