cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only fetch details when necessary.

Browse source
This commit is contained in:
Ash Wilson 2015-03-24 11:18:15 -04:00 committed by Matt Clay
parent 93b620ea8a
commit 2dde45cea9
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1123,15 +1123,17 @@ class DockerManager(object):
repo_tags = [normalize_image(self.module.params.get('image'))] repo_tags = [normalize_image(self.module.params.get('image'))]
for i in self.client.containers(all=True): for i in self.client.containers(all=True):
details = self.client.inspect_container(i['Id']) details = None
details = _docker_id_quirk(details)
running_image = normalize_image(details['Config']['Image'])
running_command = i['Command'].strip()
if name: if name:
matches = name in i.get('Names', []) matches = name in i.get('Names', [])
else: else:
details = self.client.inspect_container(i['Id'])
details = _docker_id_quirk(details)
running_image = normalize_image(details['Config']['Image'])
running_command = i['Command'].strip()
image_matches = running_image in repo_tags image_matches = running_image in repo_tags
# if a container has an entrypoint, `command` will actually equal # if a container has an entrypoint, `command` will actually equal
@ -1141,6 +1143,10 @@ class DockerManager(object):
matches = image_matches and command_matches matches = image_matches and command_matches
if matches: if matches:
if not details:
details = self.client.inspect_container(i['Id'])
details = _docker_id_quirk(details)
deployed.append(details) deployed.append(details)
return deployed return deployed