diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-18 21:12:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 21:12:04 +0200 |
| commit | 8133aa1ee88cea2c89d38c1c56974c8889ef0933 (patch) | |
| tree | 95e2cbc29508cd9e40d5bbee200f83fbc4ad1747 /pkg | |
| parent | 2c51d6f800a1ed472da3b88b4f987ab73953c8d0 (diff) | |
| parent | 0d9b952aeab95c59b28bcea42f719d06363b45b5 (diff) | |
| download | podman-8133aa1ee88cea2c89d38c1c56974c8889ef0933.tar.gz podman-8133aa1ee88cea2c89d38c1c56974c8889ef0933.tar.bz2 podman-8133aa1ee88cea2c89d38c1c56974c8889ef0933.zip | |
Merge pull request #4041 from baude/remoteconfigport
support non-standard ssh port for remote-client
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/client.go | 2 | ||||
| -rw-r--r-- | pkg/adapter/client_unix.go | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkg/adapter/client.go b/pkg/adapter/client.go index da6ff5fd0..1805c758d 100644 --- a/pkg/adapter/client.go +++ b/pkg/adapter/client.go @@ -35,7 +35,7 @@ func (r RemoteRuntime) RemoteEndpoint() (remoteEndpoint *Endpoint, err error) { if len(r.cmd.RemoteUserName) < 1 { return nil, errors.New("you must provide a username when providing a remote host name") } - rc := remoteclientconfig.RemoteConnection{r.cmd.RemoteHost, r.cmd.RemoteUserName, false} + rc := remoteclientconfig.RemoteConnection{r.cmd.RemoteHost, r.cmd.RemoteUserName, false, r.cmd.Port} remoteEndpoint, err = newBridgeConnection("", &rc, r.cmd.LogLevel) // if the user has a config file with connections in it } else if len(remoteConfigConnections.Connections) > 0 { diff --git a/pkg/adapter/client_unix.go b/pkg/adapter/client_unix.go index 4781acd06..a7bc7c1c0 100644 --- a/pkg/adapter/client_unix.go +++ b/pkg/adapter/client_unix.go @@ -10,7 +10,11 @@ import ( ) func formatDefaultBridge(remoteConn *remoteclientconfig.RemoteConnection, logLevel string) string { + port := remoteConn.Port + if port == 0 { + port = 22 + } 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 -- /usr/bin/varlink -A \'/usr/bin/podman --log-level=%s varlink \\\$VARLINK_ADDRESS\' bridge`, + port, remoteConn.Username, remoteConn.Destination, logLevel) } |