fix: resource host for rootless containers (#348)

mixedCase · web-flow · commit 230039c416e4 · 2022-04-09T17:48:29.000-05:00
diff --git a/dockertest.go b/dockertest.go
@@ -69,7 +69,11 @@ func (r *Resource) GetBoundIP(id string) string {
 		return ""
 	}
 
-	return m[0].HostIP
+	ip := m[0].HostIP
+	if ip == "0.0.0.0" || ip == "" {
+		return "localhost"
+	}
+	return ip
 }
 
 // GetHostPort returns a resource's published port with an address.
@@ -84,7 +88,7 @@ func (r *Resource) GetHostPort(portID string) string {
 	}
 
 	ip := m[0].HostIP
-	if ip == "0.0.0.0" {
+	if ip == "0.0.0.0" || ip == "" {
 		ip = "localhost"
 	}
 	return net.JoinHostPort(ip, m[0].HostPort)

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,11 @@ func (r *Resource) GetBoundIP(id string) string {`
`69`	`69`	`return ""`
`70`	`70`	`}`
`71`	`71`
`72`		`- return m[0].HostIP`
	`72`	`+ ip := m[0].HostIP`
	`73`	`+ if ip == "0.0.0.0" \|\| ip == "" {`
	`74`	`+ return "localhost"`
	`75`	`+ }`
	`76`	`+ return ip`
`73`	`77`	`}`
`74`	`78`
`75`	`79`	`// GetHostPort returns a resource's published port with an address.`
`@@ -84,7 +88,7 @@ func (r *Resource) GetHostPort(portID string) string {`
`84`	`88`	`}`
`85`	`89`
`86`	`90`	`ip := m[0].HostIP`
`87`		`- if ip == "0.0.0.0" {`
	`91`	`+ if ip == "0.0.0.0" \|\| ip == "" {`
`88`	`92`	`ip = "localhost"`
`89`	`93`	`}`
`90`	`94`	`return net.JoinHostPort(ip, m[0].HostPort)`