Merge pull request #16526 from cdoern/containerHost

fix port issues for CONTAINER_HOST
containers · Nov 17, 2022 · 44a9014 · 44a9014
2 parents c67a518 + 14ef6a9
commit 44a9014
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go
@@ -91,9 +91,12 @@ func NewConnectionWithIdentity(ctx context.Context, uri string, identity string,
 	var connection Connection
 	switch _url.Scheme {
 	case "ssh":
-		port, err := strconv.Atoi(_url.Port())
-		if err != nil {
-			return nil, err
+		port := 22
+		if _url.Port() != "" {
+			port, err = strconv.Atoi(_url.Port())
+			if err != nil {
+				return nil, err
+			}
 		}
 		conn, err := ssh.Dial(&ssh.ConnectionDialOptions{
 			Host:                        uri,

diff --git a/test/e2e/system_connection_test.go b/test/e2e/system_connection_test.go
@@ -281,6 +281,15 @@ var _ = Describe("podman system connection", func() {
 			_, err = Start(cmd, GinkgoWriter, GinkgoWriter)
 			Expect(err).ToNot(HaveOccurred())
 
+			// export the container_host env var and try again
+			err = os.Setenv("CONTAINER_HOST", fmt.Sprintf("ssh://%s@localhost", u.Username))
+			Expect(err).ToNot(HaveOccurred())
+			defer os.Unsetenv("CONTAINER_HOST")
+
+			cmd = exec.Command(podmanTest.RemotePodmanBinary, "ps")
+			_, err = Start(cmd, GinkgoWriter, GinkgoWriter)
+			Expect(err).ToNot(HaveOccurred())
+
 			uri := url.URL{
 				Scheme: "ssh",
 				User:   url.User(u.Username),