Merge pull request #409 from mattmoor/master

Fix expand_registry_url to be consistent with docker client.

1 files changed, 2 insertions, 4 deletions

diff --git a/docker/auth/auth.py b/docker/auth/auth.py
index c13eed4..cd06cb2 100644
--- a/docker/auth/auth.py
+++ b/docker/auth/auth.py
@@ -36,13 +36,11 @@ def swap_protocol(url):
 
 def expand_registry_url(hostname, insecure=False):
     if hostname.startswith('http:') or hostname.startswith('https:'):
-        if '/' not in hostname[9:]:
-            hostname = hostname + '/v1/'
         return hostname
     if utils.ping('https://' + hostname + '/v1/_ping'):
-        return 'https://' + hostname + '/v1/'
+        return 'https://' + hostname
     elif insecure:
-        return 'http://' + hostname + '/v1/'
+        return 'http://' + hostname
     else:
         raise errors.DockerException(
             "HTTPS endpoint unresponsive and insecure mode isn't enabled."