From ccbde11c8dbb8773aed84abac92c6361b8e11229 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Tue, 30 Jan 2018 18:22:41 -0800 Subject: Improve separation between auth_configs and general_configs Signed-off-by: Joffrey F --- docker/api/client.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docker/api/client.py') 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) -- cgit v1.2.1