Merge pull request #8140 from afbjorklund/podman-remote-host-port

Add support for host keys for non-22 ports (v2.1)

pkg/bindings/connection.go

@@ -214,19 +214,23 @@ func sshClient(_url *url.URL, secure bool, passPhrase string, identity string) (
 		authMethods = append(authMethods, ssh.Password(string(pass)))
 	}
 
+	port := _url.Port()
+	if port == "" {
+		port = "22"
+	}
+
 	callback := ssh.InsecureIgnoreHostKey()
 	if secure {
-		key := terminal.HostKey(_url.Hostname())
+		host := _url.Hostname()
+		if port != "22" {
+			host = fmt.Sprintf("[%s]:%s", host, port)
+		}
+		key := terminal.HostKey(host)
 		if key != nil {
 			callback = ssh.FixedHostKey(key)
 		}
 	}
 
-	port := _url.Port()
-	if port == "" {
-		port = "22"
-	}
-
 	bastion, err := ssh.Dial("tcp",
 		net.JoinHostPort(_url.Hostname(), port),
 		&ssh.ClientConfig{