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

Merge branch 'docker_image-patch-notag' of https://github.com/orgoj/ansible into orgoj-docker_image-patch-notag

Browse source
This commit is contained in:
James Cammarata 2014-05-08 21:03:57 -05:00
commit 34e52c5884
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/cloud/docker_image
View file

@ -164,7 +164,7 @@ class DockerImageManager:
for i in images: for i in images:
# Docker-py version >= 0.3 (Docker API >= 1.8) # Docker-py version >= 0.3 (Docker API >= 1.8)
if 'RepoTags' in i: if 'RepoTags' in i:
repotag = '%s:%s' % (getattr(self, 'name', ''), getattr(self, 'tag', 'latest')) repotag = ':'.join([self.name, self.tag])
if not self.name or repotag in i['RepoTags']: if not self.name or repotag in i['RepoTags']:
filtered_images.append(i) filtered_images.append(i)
# Docker-py version < 0.3 (Docker API < 1.8) # Docker-py version < 0.3 (Docker API < 1.8)
@ -188,7 +188,7 @@ def main():
argument_spec = dict( argument_spec = dict(
path = dict(required=False, default=None), path = dict(required=False, default=None),
name = dict(required=True), name = dict(required=True),
tag = dict(required=False, default=""), tag = dict(required=False, default="latest"),
nocache = dict(default=False, type='bool'), nocache = dict(default=False, type='bool'),
state = dict(default='present', choices=['absent', 'present', 'build']), state = dict(default='present', choices=['absent', 'present', 'build']),
docker_url = dict(default='unix://var/run/docker.sock'), docker_url = dict(default='unix://var/run/docker.sock'),