From e28c948f34a96fba9b3ba957eec34b434725418b Mon Sep 17 00:00:00 2001 From: aiordache Date: Mon, 19 Oct 2020 17:12:53 +0200 Subject: [PATCH] Shell out to ssh client for ssh connections Signed-off-by: aiordache --- compose/cli/docker_client.py | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py index b65262344..e4a0fea61 100644 --- a/compose/cli/docker_client.py +++ b/compose/cli/docker_client.py @@ -166,8 +166,8 @@ def docker_client(environment, version=None, context=None, tls_version=None): kwargs['credstore_env'] = { 'LD_LIBRARY_PATH': environment.get('LD_LIBRARY_PATH_ORIG'), } - - client = APIClient(**kwargs) + use_paramiko_ssh = int(environment.get('COMPOSE_PARAMIKO_SSH', 0)) + client = APIClient(use_ssh_client=not use_paramiko_ssh, **kwargs) client._original_base_url = kwargs.get('base_url') return client diff --git a/requirements.txt b/requirements.txt index 7de88eefc..b2f6fc704 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ certifi==2020.6.20 chardet==3.0.4 colorama==0.4.3; sys_platform == 'win32' distro==1.5.0 -docker==4.3.1 +docker==4.4.0 docker-pycreds==0.4.0 dockerpty==0.4.1 docopt==0.6.2