cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki 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
parent 3738339b90
commit b28459e6f5
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cloud/docker/docker.py
View file

@ -174,7 +174,8 @@ options:
default: null
detach:
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
state:
description:
@ -1258,6 +1259,13 @@ class DockerManager(object):
self.client.start(i['Id'], **params)
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):
for i in containers:
self.client.stop(i['Id'])