summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-04-27 16:31:17 -0700
committerJoffrey F <joffrey@docker.com>2016-04-28 16:53:01 -0700
commit50a6a47186cca80df27f7189d697b5cf831697b0 (patch)
tree249382667ad8fcc945442cb45a3d1eeb57e64cbd
parent237f5318f26b793b90995c932bae199863d899f3 (diff)
downloaddocker-py-1044-fix-login-default.tar.gz
Let server-side determine which serveraddress to use when none is specified1044-fix-login-default
in login() Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--docker/api/daemon.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/docker/api/daemon.py b/docker/api/daemon.py
index a149e5e..9ebe73c 100644
--- a/docker/api/daemon.py
+++ b/docker/api/daemon.py
@@ -49,8 +49,6 @@ class DaemonApiMixin(object):
elif not self._auth_configs:
self._auth_configs = auth.load_config()
- registry = registry or auth.INDEX_URL
-
authcfg = auth.resolve_authconfig(self._auth_configs, registry)
# If we found an existing auth config for this registry and username
# combination, we can return it immediately unless reauth is requested.
@@ -67,7 +65,7 @@ class DaemonApiMixin(object):
response = self._post_json(self._url('/auth'), data=req_data)
if response.status_code == 200:
- self._auth_configs[registry] = req_data
+ self._auth_configs[registry or auth.INDEX_NAME] = req_data
return self._result(response, json=True)
def ping(self):