ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-26 12:21:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

docker_container: fix interaction of detach:no with auto_remove:yes (#47396)

Browse source 
* Behave better if auto_remove and output_logs are combined. Warn if output cannot be retrieved because of auto_remove.

* Add tests.

* Added changelog.
This commit is contained in:
Felix Fontein 2018-10-23 08:51:24 +02:00 • committed by John R Barker
parent 29b4b36501
commit 3afdb28209
3 changed files with 68 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/ansible/modules/cloud/docker/docker_container.py
View file

@ -2211,20 +2211,25 @@ class ContainerManager(DockerBaseClass):
status = self.client.wait(container_id)['StatusCode']
else:
status = self.client.wait(container_id)
config = self.client.inspect_container(container_id)
logging_driver = config['HostConfig']['LogConfig']['Type']
if logging_driver == 'json-file' or logging_driver == 'journald':
output = self.client.logs(container_id, stdout=True, stderr=True, stream=False, timestamps=False)
if self.parameters.auto_remove:
output = "Cannot retrieve result as auto_remove is enabled"
if self.parameters.output_logs:
self._output_logs(msg=output)
self.client.module.warn('Cannot output_logs if auto_remove is enabled!')
else:
output = "Result logged using `%s` driver" % logging_driver
config = self.client.inspect_container(container_id)
logging_driver = config['HostConfig']['LogConfig']['Type']
if logging_driver == 'json-file' or logging_driver == 'journald':
output = self.client.logs(container_id, stdout=True, stderr=True, stream=False, timestamps=False)
if self.parameters.output_logs:
self._output_logs(msg=output)
else:
output = "Result logged using `%s` driver" % logging_driver
if status != 0:
self.fail(output, status=status)
if self.parameters.cleanup:
self.container_remove(container_id, force=True)
self.container_remove(container_id, force=True, ignore_failure=self.parameters.auto_remove)
insp = self._get_container(container_id)
if insp.raw:
insp.raw['Output'] = output
@ -2233,7 +2238,7 @@ class ContainerManager(DockerBaseClass):
return insp
return self._get_container(container_id)
def container_remove(self, container_id, link=False, force=False):
def container_remove(self, container_id, link=False, force=False, ignore_failure=False):
volume_state = (not self.parameters.keep_volumes)
self.log("remove container container:%s v:%s link:%s force%s" % (container_id, volume_state, link, force))
self.results['actions'].append(dict(removed=container_id, volume_state=volume_state, link=link, force=force))
@ -2243,7 +2248,8 @@ class ContainerManager(DockerBaseClass):
try:
response = self.client.remove_container(container_id, v=volume_state, link=link, force=force)
except Exception as exc:
self.fail("Error removing container %s: %s" % (container_id, str(exc)))
if not ignore_failure:
self.fail("Error removing container %s: %s" % (container_id, str(exc)))
return response
def container_update(self, container_id, update_parameters):