From 50a6a47186cca80df27f7189d697b5cf831697b0 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 27 Apr 2016 16:31:17 -0700 Subject: [PATCH] Let server-side determine which serveraddress to use when none is specified in login() Signed-off-by: Joffrey F --- docker/api/daemon.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/api/daemon.py b/docker/api/daemon.py index a149e5e3..9ebe73c0 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):