podman inspect show exposed ports

Podman inspect has to show exposed ports to match docker. This requires
storing the exposed ports in the container config.
A exposed port is shown as `"80/tcp": null` while a forwarded port is
shown as `"80/tcp": [{"HostIp": "", "HostPort": "8080" }]`.

Also make sure to add the exposed ports to the new image when the
container is commited.

Fixes #10777

Signed-off-by: Paul Holzinger <pholzing@redhat.com>

2 files changed, 61 insertions, 0 deletions

diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go
index 0a368b10f..fbd4068f8 100644
--- a/test/e2e/commit_test.go
+++ b/test/e2e/commit_test.go
@@ -329,4 +329,40 @@ var _ = Describe("Podman commit", func() {
 		session.WaitWithDefaultTimeout()
 		Expect(session.OutputToString()).To(Not(ContainSubstring(secretsString)))
 	})
+
+	It("podman commit adds exposed ports", func() {
+		name := "testcon"
+		s := podmanTest.Podman([]string{"run", "--name", name, "-p", "8080:80", ALPINE, "true"})
+		s.WaitWithDefaultTimeout()
+		Expect(s).Should(Exit(0))
+
+		newImageName := "newimage"
+		c := podmanTest.Podman([]string{"commit", name, newImageName})
+		c.WaitWithDefaultTimeout()
+		Expect(c).Should(Exit(0))
+
+		inspect := podmanTest.Podman([]string{"inspect", newImageName})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect).Should(Exit(0))
+		images := inspect.InspectImageJSON()
+		Expect(images).To(HaveLen(1))
+		Expect(images[0].Config.ExposedPorts).To(HaveKey("80/tcp"))
+
+		name = "testcon2"
+		s = podmanTest.Podman([]string{"run", "--name", name, "-d", nginx})
+		s.WaitWithDefaultTimeout()
+		Expect(s).Should(Exit(0))
+
+		newImageName = "newimage2"
+		c = podmanTest.Podman([]string{"commit", name, newImageName})
+		c.WaitWithDefaultTimeout()
+		Expect(c).Should(Exit(0))
+
+		inspect = podmanTest.Podman([]string{"inspect", newImageName})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect).Should(Exit(0))
+		images = inspect.InspectImageJSON()
+		Expect(images).To(HaveLen(1))
+		Expect(images[0].Config.ExposedPorts).To(HaveKey("80/tcp"))
+	})
 })
diff --git a/test/e2e/container_inspect_test.go b/test/e2e/container_inspect_test.go
index 9a95a275a..7d05b09fb 100644
--- a/test/e2e/container_inspect_test.go
+++ b/test/e2e/container_inspect_test.go
@@ -3,6 +3,7 @@ package integration
 import (
 	"os"
 
+	"github.com/containers/podman/v3/libpod/define"
 	"github.com/containers/podman/v3/pkg/annotations"
 	. "github.com/containers/podman/v3/test/utils"
 	. "github.com/onsi/ginkgo"
@@ -43,4 +44,28 @@ var _ = Describe("Podman container inspect", func() {
 		Expect(data[0].Config.Annotations[annotations.ContainerManager]).
 			To(Equal(annotations.ContainerManagerLibpod))
 	})
+
+	It("podman inspect shows exposed ports", func() {
+		name := "testcon"
+		session := podmanTest.Podman([]string{"run", "-d", "--stop-timeout", "0", "--expose", "8080/udp", "--name", name, ALPINE, "sleep", "inf"})
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(Exit(0))
+		data := podmanTest.InspectContainer(name)
+
+		Expect(data).To(HaveLen(1))
+		Expect(data[0].NetworkSettings.Ports).
+			To(Equal(map[string][]define.InspectHostPort{"8080/udp": nil}))
+	})
+
+	It("podman inspect shows exposed ports on image", func() {
+		name := "testcon"
+		session := podmanTest.Podman([]string{"run", "-d", "--expose", "8080", "--name", name, nginx})
+		session.WaitWithDefaultTimeout()
+		Expect(session).Should(Exit(0))
+
+		data := podmanTest.InspectContainer(name)
+		Expect(data).To(HaveLen(1))
+		Expect(data[0].NetworkSettings.Ports).
+			To(Equal(map[string][]define.InspectHostPort{"80/tcp": nil, "8080/tcp": nil}))
+	})
 })