From 2e274d00b3009e800e4bfa135b0875eb8a7127a3 Mon Sep 17 00:00:00 2001 From: Ulysses Souza Date: Thu, 28 May 2020 20:53:45 +0200 Subject: [PATCH] Specify when to use `tls` on Context constructor Signed-off-by: Ulysses Souza --- docker/context/context.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/context/context.py b/docker/context/context.py index 3859db2b..026a6941 100644 --- a/docker/context/context.py +++ b/docker/context/context.py @@ -57,11 +57,15 @@ class Context: self, name="docker", host=None, tls_cfg=None, skip_tls_verify=False, def_namespace=None): self.endpoints[name] = { +<<<<<<< HEAD <<<<<<< HEAD "Host": get_context_host(host, not skip_tls_verify), ======= "Host": get_context_host(host), >>>>>>> 64fdb32... Implement context management, lifecycle and unittests. +======= + "Host": get_context_host(host, not skip_tls_verify), +>>>>>>> 3ce2d89... Specify when to use `tls` on Context constructor "SkipTLSVerify": skip_tls_verify } if def_namespace: