Merge pull request #2534 from HaaLeo/feature/openssh-identity-file

aiordache · web-flow · commit f1588880036c · 2020-08-20T18:33:45.000+02:00
Support OpenSSH Identityfile option
diff --git a/docker/transport/sshconn.py b/docker/transport/sshconn.py
@@ -100,6 +100,8 @@ def __init__(self, base_url, timeout=60,
                 )
             if 'hostname' in host_config:
                 self.ssh_params['hostname'] = host_config['hostname']
+            if 'identityfile' in host_config:
+                self.ssh_params['key_filename'] = host_config['identityfile']
             if base_url.port is None and 'port' in host_config:
                 self.ssh_params['port'] = self.ssh_conf['port']
             if base_url.username is None and 'user' in host_config:

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,8 @@ def __init__(self, base_url, timeout=60,`
`100`	`100`	`)`
`101`	`101`	`if 'hostname' in host_config:`
`102`	`102`	`self.ssh_params['hostname'] = host_config['hostname']`
	`103`	`+ if 'identityfile' in host_config:`
	`104`	`+ self.ssh_params['key_filename'] = host_config['identityfile']`
`103`	`105`	`if base_url.port is None and 'port' in host_config:`
`104`	`106`	`self.ssh_params['port'] = self.ssh_conf['port']`
`105`	`107`	`if base_url.username is None and 'user' in host_config:`