diff options
| author | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2019-10-02 20:47:29 +0200 |
|---|---|---|
| committer | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2019-10-02 20:49:09 +0200 |
| commit | c831a64bb1dbce86109d1c2e00535e89a7fc5f81 (patch) | |
| tree | 4a9d117a84048f25247fe24f96f036d2c8b3ac53 | |
| parent | 23ae7604c9301f8e1ab1dbc125db6b7b724a8db2 (diff) | |
| download | podman-c831a64bb1dbce86109d1c2e00535e89a7fc5f81.tar.gz podman-c831a64bb1dbce86109d1c2e00535e89a7fc5f81.tar.bz2 podman-c831a64bb1dbce86109d1c2e00535e89a7fc5f81.zip | |
Apply changes also to the windows implementation
Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
| -rw-r--r-- | pkg/adapter/client_windows.go | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkg/adapter/client_windows.go b/pkg/adapter/client_windows.go index 31e5d9830..32302a600 100644 --- a/pkg/adapter/client_windows.go +++ b/pkg/adapter/client_windows.go @@ -9,7 +9,18 @@ import ( ) func formatDefaultBridge(remoteConn *remoteclientconfig.RemoteConnection, logLevel string) string { + port := remoteConn.Port + if port == 0 { + port = 22 + } + options := "" + if remoteConn.IdentityFile != "" { + options += " -i " + remoteConn.IdentityFile + } + if remoteConn.IgnoreHosts { + options += " -q -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" + } return fmt.Sprintf( - `ssh -T %s@%s -- /usr/bin/varlink -A '/usr/bin/podman --log-level=%s varlink $VARLINK_ADDRESS' bridge`, - remoteConn.Username, remoteConn.Destination, logLevel) + `ssh -p %d -T%s %s@%s -- varlink -A 'podman --log-level=%s varlink $VARLINK_ADDRESS' bridge`, + port, options, remoteConn.Username, remoteConn.Destination, logLevel) } |