ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge branch 'orgoj-docker_image-patch-notag' into devel

Browse source
This commit is contained in:
James Cammarata 2014-05-08 21:05:19 -05:00
commit 5c18af1afa
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/cloud/docker_image
View file

@ -45,7 +45,7 @@ options:
description:
- Image tag to work with
required: false
default: ""
default: "latest"
aliases: []
nocache:
description:
@ -164,7 +164,7 @@ class DockerImageManager:
for i in images:
# Docker-py version >= 0.3 (Docker API >= 1.8)
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']:
filtered_images.append(i)
# Docker-py version < 0.3 (Docker API < 1.8)
@ -188,7 +188,7 @@ def main():
argument_spec = dict(
path = dict(required=False, default=None),
name = dict(required=True),
tag = dict(required=False, default=""),
tag = dict(required=False, default="latest"),
nocache = dict(default=False, type='bool'),
state = dict(default='present', choices=['absent', 'present', 'build']),
docker_url = dict(default='unix://var/run/docker.sock'),