tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump docker-py 

This should fix https problems when running on
remote daemon

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
This commit is contained in:
Ulysses Souza 2020-05-29 10:11:45 +02:00
parent cad60dbc00
commit 3f0a7fe3ee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/cli/docker_client.py
View File

@ -31,7 +31,7 @@ def default_cert_path():
def make_context(host, options, environment): def make_context(host, options, environment):
tls = tls_config_from_options(options, environment) tls = tls_config_from_options(options, environment)
ctx = Context("compose", host=host) ctx = Context("compose", host=host, tls=tls.verify if tls else False)
if tls: if tls:
ctx.set_endpoint("docker", host, tls, skip_tls_verify=not tls.verify) ctx.set_endpoint("docker", host, tls, skip_tls_verify=not tls.verify)
return ctx return ctx
@ -138,7 +138,7 @@ def docker_client(environment, version=None, context=None, tls_version=None):
tls = kwargs.get("tls", None) tls = kwargs.get("tls", None)
verify = False if not tls else tls.verify verify = False if not tls else tls.verify
if host: if host:
context = Context("compose", host=host) context = Context("compose", host=host, tls=verify)
else: else:
context = ContextAPI.get_current_context() context = ContextAPI.get_current_context()
if tls: if tls:

2
requirements.txt
View File

@ -5,7 +5,7 @@ certifi==2020.4.5.1
chardet==3.0.4 chardet==3.0.4
colorama==0.4.3; sys_platform == 'win32' colorama==0.4.3; sys_platform == 'win32'
distro==1.5.0 distro==1.5.0
docker==4.2.0 docker==4.2.1
docker-pycreds==0.4.0 docker-pycreds==0.4.0
dockerpty==0.4.1 dockerpty==0.4.1
docopt==0.6.2 docopt==0.6.2