ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Wait for process exit on detached=no.

Browse source
This commit is contained in:
Ash Wilson 2015-03-30 15:52:17 -04:00 committed by Matt Clay
parent f9c294f1ad
commit ea83727fcf
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/cloud/docker/docker.py
View file

@ -196,7 +196,8 @@ options:
default: null default: null
detach: detach:
description: description:
- Enable detached mode to leave the container running in background. - Enable detached mode to leave the container running in background. If
disabled, fail unless the process exits cleanly.
default: true default: true
state: state:
description: description:
@ -1346,6 +1347,13 @@ class DockerManager(object):
self.client.start(i) self.client.start(i)
self.increment_counter('started') self.increment_counter('started')
if not self.module.params.get('detach'):
status = self.client.wait(i['Id'])
if status != 0:
output = self.client.logs(i['Id'], stdout=True, stderr=True,
stream=False, timestamps=False)
self.module.fail_json(status=status, msg=output)
def stop_containers(self, containers): def stop_containers(self, containers):
for i in containers: for i in containers:
self.client.stop(i['Id']) self.client.stop(i['Id'])