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

Merge pull request #7404 from jimi-c/issue_7363_docker_names

Browse source 
Make sure the docker data has a "Names" field before using it
This commit is contained in:
James Cammarata 2014-05-14 14:44:16 -05:00
commit 154ef942eb
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/cloud/docker
View file

@ -507,7 +507,9 @@ class DockerManager:
running_image, running_tag = self.get_split_image_tag(i['Image']) running_image, running_tag = self.get_split_image_tag(i['Image'])
running_command = i['Command'].strip() running_command = i['Command'].strip()
name_matches = (name and name in i['Names']) name_matches = False
if i["Names"]:
name_matches = (name and name in i['Names'])
image_matches = (running_image == image) image_matches = (running_image == image)
tag_matches = (not tag or running_tag == tag) tag_matches = (not tag or running_tag == tag)
# if a container has an entrypoint, `command` will actually equal # if a container has an entrypoint, `command` will actually equal