Skip to content

Commit 2e274d0

Browse files
ulyssessouzaaiordache
authored andcommitted
Specify when to use tls on Context constructor
Signed-off-by: Ulysses Souza <[email protected]>
1 parent 67b77f2 commit 2e274d0

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

docker/context/context.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,15 @@ def set_endpoint(
5757
self, name="docker", host=None, tls_cfg=None,
5858
skip_tls_verify=False, def_namespace=None):
5959
self.endpoints[name] = {
60+
<<<<<<< HEAD
6061
<<<<<<< HEAD
6162
"Host": get_context_host(host, not skip_tls_verify),
6263
=======
6364
"Host": get_context_host(host),
6465
>>>>>>> 64fdb32... Implement context management, lifecycle and unittests.
66+
=======
67+
"Host": get_context_host(host, not skip_tls_verify),
68+
>>>>>>> 3ce2d89... Specify when to use `tls` on Context constructor
6569
"SkipTLSVerify": skip_tls_verify
6670
}
6771
if def_namespace:

0 commit comments

Comments
 (0)