summaryrefslogtreecommitdiff
path: root/docker/auth.py
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2018-11-30 15:40:14 -0800
committerJoffrey F <joffrey@docker.com>2018-11-30 15:56:39 -0800
commitbc84ed11ec7f7e20f27139a5e44ae0862d5a1f7b (patch)
tree0e273f39aab7f0014e8b36194308d70ee38abd48 /docker/auth.py
parentc344660f20353bedec6c18ef22b25b3083c8fe3f (diff)
downloaddocker-py-authconfig_fix.tar.gz
Fix empty authconfig detectionauthconfig_fix
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/auth.py')
-rw-r--r--docker/auth.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/auth.py b/docker/auth.py
index c1b874f..58b35eb 100644
--- a/docker/auth.py
+++ b/docker/auth.py
@@ -39,7 +39,7 @@ def resolve_index_name(index_name):
def get_config_header(client, registry):
log.debug('Looking for auth config')
- if not client._auth_configs:
+ if not client._auth_configs or client._auth_configs.is_empty:
log.debug(
"No auth config in memory - loading from filesystem"
)
@@ -212,6 +212,12 @@ class AuthConfig(dict):
def cred_helpers(self):
return self.get('credHelpers', {})
+ @property
+ def is_empty(self):
+ return (
+ not self.auths and not self.creds_store and not self.cred_helpers
+ )
+
def resolve_authconfig(self, registry=None):
"""
Returns the authentication data from the given auth configuration for a