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

Merge branch 'kolloch-devel' into devel

This commit is contained in:
James Cammarata 2014-08-08 14:10:38 -05:00
commit 5deaeb3b94

View file

@ -499,6 +499,13 @@ class DockerManager:
else:
return image, tag
def get_split_full_image_tag(self, image):
tag = "latest"
if image.find(':') > 0:
return image.split(':')
else:
return image, tag
def get_summary_counters_msg(self):
msg = ""
for k, v in self.counters.iteritems():
@ -598,7 +605,8 @@ class DockerManager:
try:
containers = do_create(count, params)
except:
self.client.pull(params['image'])
image, tag = self.get_split_full_image_tag(params['image'])
self.client.pull(image, tag = tag)
self.increment_counter('pull')
containers = do_create(count, params)