Merge pull request #1050 from docker/1044-fix-login-default

Let server-side determine which serveraddress to use when unspecified
This commit is contained in:
Joffrey F 2016-04-28 17:07:11 -07:00
commit 5df7b317e4
1 changed files with 1 additions and 3 deletions

View File

@ -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):