Add insecure_registry to docker-py pull method
Starting from docker-py>=0.5.0 it is impossible to work with private registries based on HTTP. So we need additional parameter to allow pull from insecure registry Related to ansible/ansible#9111
This commit is contained in:
parent
7b74e451d9
commit
807d964a48
1 changed files with 10 additions and 2 deletions
|
@ -224,6 +224,13 @@ options:
|
||||||
default: false
|
default: false
|
||||||
aliases: []
|
aliases: []
|
||||||
version_added: "1.9"
|
version_added: "1.9"
|
||||||
|
insecure_registry:
|
||||||
|
description:
|
||||||
|
- Use insecure private registry by HTTP instead of HTTPS (needed for docker-py >= 0.5.0).
|
||||||
|
required: false
|
||||||
|
default: false
|
||||||
|
aliases: []
|
||||||
|
version_added: "1.9"
|
||||||
|
|
||||||
author: Cove Schneider, Joshua Conner, Pavel Antonov
|
author: Cove Schneider, Joshua Conner, Pavel Antonov
|
||||||
requirements: [ "docker-py >= 0.3.0", "docker >= 0.10.0" ]
|
requirements: [ "docker-py >= 0.3.0", "docker >= 0.10.0" ]
|
||||||
|
@ -743,7 +750,7 @@ class DockerManager:
|
||||||
except:
|
except:
|
||||||
self.module.fail_json(msg="failed to login to the remote registry, check your username/password.")
|
self.module.fail_json(msg="failed to login to the remote registry, check your username/password.")
|
||||||
try:
|
try:
|
||||||
self.client.pull(image, tag=tag)
|
self.client.pull(image, tag=tag, insecure_registry=self.module.params.get('insecure_registry'))
|
||||||
except:
|
except:
|
||||||
self.module.fail_json(msg="failed to pull the specified image: %s" % resource)
|
self.module.fail_json(msg="failed to pull the specified image: %s" % resource)
|
||||||
self.increment_counter('pull')
|
self.increment_counter('pull')
|
||||||
|
@ -840,7 +847,8 @@ def main():
|
||||||
tty = dict(default=False, type='bool'),
|
tty = dict(default=False, type='bool'),
|
||||||
lxc_conf = dict(default=None, type='list'),
|
lxc_conf = dict(default=None, type='list'),
|
||||||
name = dict(default=None),
|
name = dict(default=None),
|
||||||
net = dict(default=None)
|
net = dict(default=None),
|
||||||
|
insecure_registry = dict(default=False, type='bool'),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue