opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-02 19:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Apply changes also to the windows implementation

Browse Source 
Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
This commit is contained in:
Anders F Björklund
2019-10-02 20:47:29 +02:00
parent 23ae7604c9
commit c831a64bb1
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/adapter/client_windows.go
View File

@ -9,7 +9,18 @@ import (
) )
func formatDefaultBridge(remoteConn *remoteclientconfig.RemoteConnection, logLevel string) string { 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( return fmt.Sprintf(
`ssh -T %s@%s -- /usr/bin/varlink -A '/usr/bin/podman --log-level=%s varlink $VARLINK_ADDRESS' bridge`, `ssh -p %d -T%s %s@%s -- varlink -A 'podman --log-level=%s varlink $VARLINK_ADDRESS' bridge`,
remoteConn.Username, remoteConn.Destination, logLevel) port, options, remoteConn.Username, remoteConn.Destination, logLevel)
} }