|
|
|
@ -191,6 +191,7 @@ EXAMPLES = '''
|
|
|
|
|
name: registry.ansible.com/chouseknecht/sinatra
|
|
|
|
|
tag: v1
|
|
|
|
|
load_path: my_sinatra.tar
|
|
|
|
|
push: True
|
|
|
|
|
'''
|
|
|
|
|
|
|
|
|
|
RETURN = '''
|
|
|
|
@ -267,7 +268,6 @@ class ImageManager(DockerBaseClass):
|
|
|
|
|
self.log("Building image %s" % image_name)
|
|
|
|
|
self.results['actions'].append("Built image %s from %s" % (image_name, self.path))
|
|
|
|
|
self.results['changed'] = True
|
|
|
|
|
self.push = True
|
|
|
|
|
if not self.check_mode:
|
|
|
|
|
self.results['image'] = self.build_image()
|
|
|
|
|
elif self.load_path:
|
|
|
|
@ -275,7 +275,6 @@ class ImageManager(DockerBaseClass):
|
|
|
|
|
if not os.path.isfile(self.load_path):
|
|
|
|
|
self.fail("Error loading image %s. Specified path %s does not exist." % (self.name,
|
|
|
|
|
self.load_path))
|
|
|
|
|
self.push = True
|
|
|
|
|
image_name = self.name
|
|
|
|
|
if self.tag:
|
|
|
|
|
image_name = "%s:%s" % (self.name, self.tag)
|
|
|
|
|