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

Fix error when container has no names.

Browse source 
Rename loop variable from "i" to more informative "container"

Fixes #1188
This commit is contained in:
Toshio Kuratomi 2015-05-04 10:16:01 -07:00 committed by Matt Clay
parent dd6b153700
commit c2bf2c7c54
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1131,17 +1131,20 @@ class DockerManager(object):
else:
repo_tags = [normalize_image(self.module.params.get('image'))]
for i in self.client.containers(all=True):
for container in self.client.containers(all=True):
details = None
if name:
matches = name in i.get('Names', [])
name_list = container.get('Names')
if name_list is None:
name_list = []
matches = name in name_list
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()
running_command = container['Command'].strip()
image_matches = running_image in repo_tags
@ -1153,7 +1156,7 @@ class DockerManager(object):
if matches:
if not details:
details = self.client.inspect_container(i['Id'])
details = self.client.inspect_container(container['Id'])
details = _docker_id_quirk(details)
deployed.append(details)