summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Petazzoni <maxime.petazzoni@bulix.org>2015-01-29 17:38:32 -0800
committerMaxime Petazzoni <maxime.petazzoni@bulix.org>2015-01-29 17:38:32 -0800
commitc0703e3516980513ef1d5f7ea41bb56eccebcc61 (patch)
treed1f094b19df9aec7198fb4030b7efe6e0a6efaf0
parentd3a2d900cbf5b5368f496e795d2974b4816d77bb (diff)
parent1fb887c268883574bc807423b00192008e195710 (diff)
downloaddocker-py-c0703e3516980513ef1d5f7ea41bb56eccebcc61.tar.gz
Merge pull request #468 from wellbehavedsoftware/fix-auth-urls
Fix registry url canonicalization in resolve_authconfig
-rw-r--r--docker/auth/auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/auth/auth.py b/docker/auth/auth.py
index e4bc657..fe53c76 100644
--- a/docker/auth/auth.py
+++ b/docker/auth/auth.py
@@ -83,7 +83,7 @@ def resolve_authconfig(authconfig, registry=None):
#
# as there is only one auth entry which is fully qualified we need to start
# parsing and matching
- if '/' not in registry:
+ if '/v1/' not in registry:
registry = registry + '/v1/'
if not registry.startswith('http:') and not registry.startswith('https:'):
registry = 'https://' + registry