summaryrefslogtreecommitdiff
path: root/docker/api/client.py
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2018-01-30 18:22:41 -0800
committerJoffrey F <joffrey@docker.com>2018-01-30 18:42:38 -0800
commitccbde11c8dbb8773aed84abac92c6361b8e11229 (patch)
tree8bf4e02458dded8990a80a8e6bdcb3a1cdea3532 /docker/api/client.py
parent75e2e8ad816ac35e1c4928f6b3f9e40841ca493c (diff)
downloaddocker-py-improve_authconfig_genconfig_separation.tar.gz
Improve separation between auth_configs and general_configsimprove_authconfig_genconfig_separation
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/api/client.py')
-rw-r--r--docker/api/client.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/api/client.py b/docker/api/client.py
index 10640e1..07bcfae 100644
--- a/docker/api/client.py
+++ b/docker/api/client.py
@@ -87,6 +87,7 @@ class APIClient(
"""
__attrs__ = requests.Session.__attrs__ + ['_auth_configs',
+ '_general_configs',
'_version',
'base_url',
'timeout']
@@ -105,8 +106,10 @@ class APIClient(
self.timeout = timeout
self.headers['User-Agent'] = user_agent
- self._auth_configs = auth.load_config()
self._general_configs = config.load_general_config()
+ self._auth_configs = auth.load_config(
+ config_dict=self._general_configs
+ )
base_url = utils.parse_host(
base_url, IS_WINDOWS_PLATFORM, tls=bool(tls)