diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-20 22:22:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 22:22:20 +0100 |
| commit | 7a095af92a6a39845b1c362222b23632f3e17001 (patch) | |
| tree | 52a8692894690a8f09e025f90d6d2b5045259e4f /pkg/bindings/connection.go | |
| parent | 6df1d2043bd3cd2252ea3d737cf542e332106074 (diff) | |
| parent | c81e065149da73ae904aa19ee46a23d1ab8ce55c (diff) | |
| download | podman-7a095af92a6a39845b1c362222b23632f3e17001.tar.gz podman-7a095af92a6a39845b1c362222b23632f3e17001.tar.bz2 podman-7a095af92a6a39845b1c362222b23632f3e17001.zip | |
Merge pull request #5571 from baude/v2exists
podmanv2 container exists|wait
Diffstat (limited to 'pkg/bindings/connection.go')
| -rw-r--r-- | pkg/bindings/connection.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go index 289debd8c..4fe4dd72d 100644 --- a/pkg/bindings/connection.go +++ b/pkg/bindings/connection.go @@ -165,8 +165,13 @@ func sshClient(_url *url.URL, identity string, secure bool) (*http.Client, error } } + port := _url.Port() + if port == "" { + port = "22" + } + bastion, err := ssh.Dial("tcp", - net.JoinHostPort(_url.Hostname(), _url.Port()), + net.JoinHostPort(_url.Hostname(), port), &ssh.ClientConfig{ User: _url.User.Username(), Auth: []ssh.AuthMethod{auth}, |