Skip to content

Commit 123bb8a

Browse files
committed
Allow setting Client.verify to false when tls_verify is set to false in TLSConfig
1 parent 6080fa5 commit 123bb8a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

docker/tls.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class TLSConfig(object):
99
verify = None
1010
ssl_version = None
1111

12-
def __init__(self, tls, tls_cert=None, tls_key=None, tls_verify=False,
12+
def __init__(self, tls, tls_cert=None, tls_key=None, tls_verify=None,
1313
tls_ca_cert=None, ssl_version=None):
1414
# Argument compatibility/mapping with
1515
# http://docs.docker.com/examples/https/
@@ -36,9 +36,9 @@ def __init__(self, tls, tls_cert=None, tls_key=None, tls_verify=False,
3636

3737
# Either set verify to True (public/default CA checks) or to the
3838
# path of a CA Cert file.
39-
if tls_verify:
39+
if tls_verify is not None:
4040
if not tls_ca_cert:
41-
self.verify = True
41+
self.verify = tls_verify
4242
elif os.path.isfile(tls_ca_cert):
4343
self.verify = tls_ca_cert
4444
else:

0 commit comments

Comments
 (0)