|
|
@ -453,11 +453,11 @@ class ImageManager(DockerBaseClass):
|
|
|
|
self.load_path = parameters.get('load_path')
|
|
|
|
self.load_path = parameters.get('load_path')
|
|
|
|
self.name = parameters.get('name')
|
|
|
|
self.name = parameters.get('name')
|
|
|
|
self.network = build.get('network')
|
|
|
|
self.network = build.get('network')
|
|
|
|
self.nocache = build.get('nocache')
|
|
|
|
self.nocache = build.get('nocache', False)
|
|
|
|
self.build_path = build.get('path')
|
|
|
|
self.build_path = build.get('path')
|
|
|
|
self.pull = build.get('pull')
|
|
|
|
self.pull = build.get('pull')
|
|
|
|
self.repository = parameters.get('repository')
|
|
|
|
self.repository = parameters.get('repository')
|
|
|
|
self.rm = build.get('rm')
|
|
|
|
self.rm = build.get('rm', True)
|
|
|
|
self.state = parameters.get('state')
|
|
|
|
self.state = parameters.get('state')
|
|
|
|
self.tag = parameters.get('tag')
|
|
|
|
self.tag = parameters.get('tag')
|
|
|
|
self.http_timeout = build.get('http_timeout')
|
|
|
|
self.http_timeout = build.get('http_timeout')
|
|
|
@ -879,7 +879,7 @@ def main():
|
|
|
|
if client.module.params[option] != default_value:
|
|
|
|
if client.module.params[option] != default_value:
|
|
|
|
if client.module.params['build'] is None:
|
|
|
|
if client.module.params['build'] is None:
|
|
|
|
client.module.params['build'] = dict()
|
|
|
|
client.module.params['build'] = dict()
|
|
|
|
if client.module.params['build'].get(build_option) != default_value:
|
|
|
|
if client.module.params['build'].get(build_option, default_value) != default_value:
|
|
|
|
client.fail('Cannot specify both %s and build.%s!' % (option, build_option))
|
|
|
|
client.fail('Cannot specify both %s and build.%s!' % (option, build_option))
|
|
|
|
client.module.params['build'][build_option] = client.module.params[option]
|
|
|
|
client.module.params['build'][build_option] = client.module.params[option]
|
|
|
|
client.module.warn('Please specify build.%s instead of %s. The %s option '
|
|
|
|
client.module.warn('Please specify build.%s instead of %s. The %s option '
|
|
|
|