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

Compare container images to Config.Image.

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

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

@ -424,6 +424,13 @@ def get_split_image_tag(image):
return resource, tag return resource, tag
def normalize_image(image):
"""
Normalize a Docker image name to include the implied :latest tag.
"""
return ":".join(get_split_image_tag(image))
def is_running(container): def is_running(container):
'''Return True if an inspected container is in a state we consider "running."''' '''Return True if an inspected container is in a state we consider "running."'''
@ -1113,11 +1120,13 @@ class DockerManager(object):
if inspected: if inspected:
repo_tags = self.get_image_repo_tags() repo_tags = self.get_image_repo_tags()
else: else:
image, tag = get_split_image_tag(self.module.params.get('image')) repo_tags = [normalize_image(self.module.params.get('image'))]
repo_tags = [':'.join([image, tag])]
for i in self.client.containers(all=True): for i in self.client.containers(all=True):
running_image = i['Image'] 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 = i['Command'].strip()
if name: if name:
@ -1132,9 +1141,6 @@ class DockerManager(object):
matches = image_matches and command_matches matches = image_matches and command_matches
if matches: if matches:
details = self.client.inspect_container(i['Id'])
details = _docker_id_quirk(details)
deployed.append(details) deployed.append(details)
return deployed return deployed