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

Merge 211d5c443a into db7f8b8bb6

This commit is contained in:
DevMax 2025-01-23 10:18:41 +00:00 committed by GitHub
parent db7f8b8bb6 211d5c443a
commit c71f167919
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/api/client.py
View File

@ -116,6 +116,7 @@ class APIClient(
timeout=DEFAULT_TIMEOUT_SECONDS, tls=False,
user_agent=DEFAULT_USER_AGENT, num_pools=None,
credstore_env=None, use_ssh_client=False,
ssh_key_phrase=None, ssh_key_filename=None,
max_pool_size=DEFAULT_MAX_POOL_SIZE):
super().__init__()
@ -180,7 +181,8 @@ class APIClient(
try:
self._custom_adapter = SSHHTTPAdapter(
base_url, timeout, pool_connections=num_pools,
max_pool_size=max_pool_size, shell_out=use_ssh_client
max_pool_size=max_pool_size, shell_out=use_ssh_client,
ssh_key_phrase=ssh_key_phrase, ssh_key_filename=ssh_key_filename
)
except NameError as err:
raise DockerException(

8
docker/transport/sshconn.py
View File

@ -165,7 +165,7 @@ class SSHHTTPAdapter(BaseHTTPAdapter):
def __init__(self, base_url, timeout=60,
pool_connections=constants.DEFAULT_NUM_POOLS,
max_pool_size=constants.DEFAULT_MAX_POOL_SIZE,
shell_out=False):
shell_out=False, ssh_key_filename=None, ssh_key_phrase=None, ):
self.ssh_client = None
if not shell_out:
self._create_paramiko_client(base_url)
@ -180,6 +180,8 @@ class SSHHTTPAdapter(BaseHTTPAdapter):
self.pools = RecentlyUsedContainer(
pool_connections, dispose_func=lambda p: p.close()
)
self.ssh_key_filename = ssh_key_filename
self.ssh_key_phrase = ssh_key_phrase
super().__init__()
def _create_paramiko_client(self, base_url):
@ -209,6 +211,10 @@ class SSHHTTPAdapter(BaseHTTPAdapter):
self.ssh_params['username'] = host_config['user']
if 'identityfile' in host_config:
self.ssh_params['key_filename'] = host_config['identityfile']
if self.ssh_key_filename:
self.ssh_params['key_filename'] = self.ssh_key_filename
if self.ssh_key_phrase:
self.ssh_params['passphrase'] = self.ssh_key_phrase
self.ssh_client.load_system_host_keys()
self.ssh_client.set_missing_host_key_policy(paramiko.RejectPolicy())