diff options
| author | Joffrey F <joffrey@docker.com> | 2014-08-22 17:28:59 +0200 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2014-08-22 17:28:59 +0200 |
| commit | be831c1130cbd7ded46c2245f81bee92fdc5a167 (patch) | |
| tree | 827b32086d434891729870c9795aa403bd36e0f3 /docker/client.py | |
| parent | c76fd8d91481d33cee6fcfaa61025c12caa95b98 (diff) | |
| download | docker-py-insecure_registry.tar.gz | |
Don't fallback to HTTP unless insecure_registry is specified when pushing/pullinginsecure_registry
Diffstat (limited to 'docker/client.py')
| -rw-r--r-- | docker/client.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/docker/client.py b/docker/client.py index c4871a6..714447b 100644 --- a/docker/client.py +++ b/docker/client.py @@ -713,10 +713,13 @@ class Client(requests.Session): return h_ports - def pull(self, repository, tag=None, stream=False): + def pull(self, repository, tag=None, stream=False, + insecure_registry=False): if not tag: repository, tag = utils.parse_repository_tag(repository) - registry, repo_name = auth.resolve_repository_name(repository) + registry, repo_name = auth.resolve_repository_name( + repository, insecure=insecure_registry + ) if repo_name.count(":") == 1: repository, tag = repository.rsplit(":", 1) @@ -747,10 +750,13 @@ class Client(requests.Session): else: return self._result(response) - def push(self, repository, tag=None, stream=False): + def push(self, repository, tag=None, stream=False, + insecure_registry=False): if not tag: repository, tag = utils.parse_repository_tag(repository) - registry, repo_name = auth.resolve_repository_name(repository) + registry, repo_name = auth.resolve_repository_name( + repository, insecure=insecure_registry + ) u = self._url("/images/{0}/push".format(repository)) params = { 'tag': tag |