Merge pull request #468 from wellbehavedsoftware/fix-auth-urls

mpetazzoni · mpetazzoni · commit c0703e351698 · 2015-01-29T17:38:32.000-08:00
Fix registry url canonicalization in resolve_authconfig
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ def resolve_authconfig(authconfig, registry=None):`
`83`	`83`	`#`
`84`	`84`	`# as there is only one auth entry which is fully qualified we need to start`
`85`	`85`	`# parsing and matching`
`86`		`- if '/' not in registry:`
	`86`	`+ if '/v1/' not in registry:`
`87`	`87`	`registry = registry + '/v1/'`
`88`	`88`	`if not registry.startswith('http:') and not registry.startswith('https:'):`
`89`	`89`	`registry = 'https://' + registry`