summaryrefslogtreecommitdiff
path: root/docker/client.py
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-01-28 16:25:23 -0800
committerJoffrey F <joffrey@docker.com>2016-01-28 16:25:23 -0800
commitbb94fe7a8c83b82050c8971464c2838d335b41a4 (patch)
tree497ca19797bc2bc2740aeb1473e4068db6ed0696 /docker/client.py
parent446e6d08dd569194a27bb354a184b7d94ecf5e48 (diff)
downloaddocker-py-bb94fe7a8c83b82050c8971464c2838d335b41a4.tar.gz
Support unspecified protocol in base_url when using TLS894-docker_host_env
(assume HTTPS) Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/client.py')
-rw-r--r--docker/client.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/client.py b/docker/client.py
index fb186cc..7d1f7c4 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -45,17 +45,17 @@ class Client(
timeout=constants.DEFAULT_TIMEOUT_SECONDS, tls=False):
super(Client, self).__init__()
- if tls and (not base_url or not base_url.startswith('https://')):
+ if tls and not base_url:
raise errors.TLSParameterError(
- 'If using TLS, the base_url argument must begin with '
- '"https://".')
+ 'If using TLS, the base_url argument must be provided.'
+ )
self.base_url = base_url
self.timeout = timeout
self._auth_configs = auth.load_config()
- base_url = utils.parse_host(base_url, sys.platform)
+ base_url = utils.parse_host(base_url, sys.platform, tls=bool(tls))
if base_url.startswith('http+unix://'):
self._custom_adapter = unixconn.UnixAdapter(base_url, timeout)
self.mount('http+docker://', self._custom_adapter)