summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorentin Henry <corentinhenry@gmail.com>2018-12-17 10:44:37 +0100
committerJoffrey F <joffrey@docker.com>2019-01-09 11:30:58 -0800
commit6969e8becde593ee3dc1d3093d9299502ccc10ed (patch)
tree0fe1e6b8e2a7ded56093c5a219746c628e598fe3
parent2c4a8651a82016bd422e09688542872d3e236958 (diff)
downloaddocker-py-6969e8becde593ee3dc1d3093d9299502ccc10ed.tar.gz
handle url-based proxy configurations
Signed-off-by: Corentin Henry <corentinhenry@gmail.com>
-rw-r--r--docker/api/client.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/api/client.py b/docker/api/client.py
index b12398e..668dfee 100644
--- a/docker/api/client.py
+++ b/docker/api/client.py
@@ -115,10 +115,13 @@ class APIClient(
self.headers['User-Agent'] = user_agent
self._general_configs = config.load_general_config()
+
+ proxy_config = self._general_configs.get('proxies', {})
try:
- proxies = self._general_configs['proxies']['default']
+ proxies = proxy_config[base_url]
except KeyError:
- proxies = {}
+ proxies = proxy_config.get('default', {})
+
self._proxy_configs = ProxyConfig.from_dict(proxies)
self._auth_configs = auth.load_config(