diff options
| author | Joffrey F <joffrey@docker.com> | 2014-07-03 01:00:39 +0200 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2014-07-03 01:00:39 +0200 |
| commit | 123bb8a436b4080a62d1bbb3c5ab54b419b8f0f0 (patch) | |
| tree | b6172929964d4f9716ee274a576c7f5854dcc129 /docker | |
| parent | 6080fa50973116e07ca5f2e3bc8cd4cebe7c9f23 (diff) | |
| download | docker-py-123bb8a436b4080a62d1bbb3c5ab54b419b8f0f0.tar.gz | |
Allow setting Client.verify to false when tls_verify is set to false in TLSConfig
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/tls.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/tls.py b/docker/tls.py index 6b6b71f..b344d67 100644 --- a/docker/tls.py +++ b/docker/tls.py @@ -9,7 +9,7 @@ class TLSConfig(object): verify = None ssl_version = None - def __init__(self, tls, tls_cert=None, tls_key=None, tls_verify=False, + def __init__(self, tls, tls_cert=None, tls_key=None, tls_verify=None, tls_ca_cert=None, ssl_version=None): # Argument compatibility/mapping with # http://docs.docker.com/examples/https/ @@ -36,9 +36,9 @@ class TLSConfig(object): # Either set verify to True (public/default CA checks) or to the # path of a CA Cert file. - if tls_verify: + if tls_verify is not None: if not tls_ca_cert: - self.verify = True + self.verify = tls_verify elif os.path.isfile(tls_ca_cert): self.verify = tls_ca_cert else: |
