Merge pull request #7404 from jimi-c/issue_7363_docker_names

Make sure the docker data has a "Names" field before using it
reviewable/pr18780/r1
James Cammarata 11 years ago
commit 8622a3f396

@ -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

Loading…
Cancel
Save