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

docker_compose: fix #12 (#119)

Browse Source 
* fix #12

* Create 12-correct_pull_wo_starting.yaml

* Update changelogs/fragments/12-correct_pull_wo_starting.yaml

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update changelogs/fragments/12-correct_pull_wo_starting.yaml

Co-authored-by: Amin Vakil <info@aminvakil.com>

* Update docker_compose.py

Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Amin Vakil <info@aminvakil.com>
This commit is contained in:
Alexandr N. Zamaraev 2021-05-04 12:53:38 +07:00 committed by GitHub
parent cffba7b15d
commit 859bc29f9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/12-correct_pull_wo_starting.yaml Normal file
View File

@ -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)."

7
plugins/modules/docker_compose.py
View File

@ -772,7 +772,7 @@ class ContainerManager(DockerBaseClass):
))
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 @@ class ContainerManager(DockerBaseClass):
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 @@ class ContainerManager(DockerBaseClass):
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: