From 1c856f2caa480bd0d9f49c9c4866b0076c4a9930 Mon Sep 17 00:00:00 2001 From: Shijiang Wei Date: Tue, 15 Mar 2016 19:19:11 +0800 Subject: [PATCH] make the DOCKER_TLS_VERIFY environment align with docker CLI Signed-off-by: Shijiang Wei --- docker/utils/utils.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docker/utils/utils.py b/docker/utils/utils.py index bc26ce82f7..4f43712203 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -457,13 +457,8 @@ def kwargs_from_env(ssl_version=None, assert_hostname=None): # empty string for tls verify counts as "false". # Any value or 'unset' counts as true. - tls_verify = os.environ.get('DOCKER_TLS_VERIFY') - if tls_verify == '': - tls_verify = False - enable_tls = True - else: - tls_verify = tls_verify is not None - enable_tls = cert_path or tls_verify + tls_verify = os.environ.get('DOCKER_TLS_VERIFY') or False + enable_tls = tls_verify or cert_path or False params = {}