2 files changed, 52 insertions, 14 deletions
diff --git a/cmd/podman/common/util.go b/cmd/podman/common/util.go
index 422e241af..ce323a4ba 100644
--- a/cmd/podman/common/util.go
+++ b/cmd/podman/common/util.go
@@ -96,14 +96,44 @@ func createPortBindings(ports []string) ([]specgen.PortMapping, error) {
 			return nil, errors.Errorf("invalid port format - protocol can only be specified once")
 		}
 
-		splitPort := strings.Split(splitProto[0], ":")
+		remainder := splitProto[0]
+		haveV6 := false
+
+		// Check for an IPv6 address in brackets
+		splitV6 := strings.Split(remainder, "]")
+		switch len(splitV6) {
+		case 1:
+			// Do nothing, proceed as before
+		case 2:
+			// We potentially have an IPv6 address
+			haveV6 = true
+			if !strings.HasPrefix(splitV6[0], "[") {
+				return nil, errors.Errorf("invalid port format - IPv6 addresses must be enclosed by []")
+			}
+			if !strings.HasPrefix(splitV6[1], ":") {
+				return nil, errors.Errorf("invalid port format - IPv6 address must be followed by a colon (':')")
+			}
+			ipNoPrefix := strings.TrimPrefix(splitV6[0], "[")
+			hostIP = &ipNoPrefix
+			remainder = strings.TrimPrefix(splitV6[1], ":")
+		default:
+			return nil, errors.Errorf("invalid port format - at most one IPv6 address can be specified in a --publish")
+		}
+
+		splitPort := strings.Split(remainder, ":")
 		switch len(splitPort) {
 		case 1:
+			if haveV6 {
+				return nil, errors.Errorf("invalid port format - must provide host and destination port if specifying an IP")
+			}
 			ctrPort = splitPort[0]
 		case 2:
 			hostPort = &(splitPort[0])
 			ctrPort = splitPort[1]
 		case 3:
+			if haveV6 {
+				return nil, errors.Errorf("invalid port format - when v6 address specified, must be [ipv6]:hostPort:ctrPort")
+			}
 			hostIP = &(splitPort[0])
 			hostPort = &(splitPort[1])
 			ctrPort = splitPort[2]
diff --git a/cmd/podman/play/kube.go b/cmd/podman/play/kube.go
index 1fbf24d5e..c26ca9853 100644
--- a/cmd/podman/play/kube.go
+++ b/cmd/podman/play/kube.go
@@ -92,21 +92,29 @@ func kube(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	for _, l := range report.Logs {
-		fmt.Fprintf(os.Stderr, l)
+	for _, pod := range report.Pods {
+		for _, l := range pod.Logs {
+			fmt.Fprintf(os.Stderr, l)
+		}
 	}
 
-	fmt.Printf("Pod:\n%s\n", report.Pod)
-	switch len(report.Containers) {
-	case 0:
-		return nil
-	case 1:
-		fmt.Printf("Container:\n")
-	default:
-		fmt.Printf("Containers:\n")
-	}
-	for _, ctr := range report.Containers {
-		fmt.Println(ctr)
+	for _, pod := range report.Pods {
+		fmt.Printf("Pod:\n")
+		fmt.Println(pod.ID)
+
+		switch len(pod.Containers) {
+		case 0:
+			continue
+		case 1:
+			fmt.Printf("Container:\n")
+		default:
+			fmt.Printf("Containers:\n")
+		}
+		for _, ctr := range pod.Containers {
+			fmt.Println(ctr)
+		}
+		// Empty line for space for next block
+		fmt.Println()
 	}
 
 	return nil