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

Merge branch 'kolloch-devel' into devel

Browse source
This commit is contained in:
James Cammarata 2014-08-08 14:10:38 -05:00
commit 5deaeb3b94
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/cloud/docker
View file

@ -499,6 +499,13 @@ class DockerManager:
else: else:
return image, tag 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): def get_summary_counters_msg(self):
msg = "" msg = ""
for k, v in self.counters.iteritems(): for k, v in self.counters.iteritems():
@ -598,7 +605,8 @@ class DockerManager:
try: try:
containers = do_create(count, params) containers = do_create(count, params)
except: 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') self.increment_counter('pull')
containers = do_create(count, params) containers = do_create(count, params)