opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24164 from mheon/host_network_no_expose_in_ports

Browse Source 
Exposed ports are only included when not --net=host
This commit is contained in:
openshift-merge-bot[bot]
2024-10-04 17:03:40 +00:00
committed by GitHub
parent 4b958b3fa0 8061553c0f
commit d28af234de
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container_inspect.go
View File

@ -211,7 +211,11 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver
return nil, err return nil, err
} }
data.NetworkSettings = networkConfig data.NetworkSettings = networkConfig
addInspectPortsExpose(c.config.ExposedPorts, data.NetworkSettings.Ports) // Ports in NetworkSettings includes exposed ports for network modes that are not host,
// and not container.
if !(c.config.NetNsCtr != "" || c.NetworkMode() == "host") {
addInspectPortsExpose(c.config.ExposedPorts, data.NetworkSettings.Ports)
}
inspectConfig := c.generateInspectContainerConfig(ctrSpec) inspectConfig := c.generateInspectContainerConfig(ctrSpec)
data.Config = inspectConfig data.Config = inspectConfig

19
test/e2e/run_networking_test.go
View File

@ -441,19 +441,22 @@ EXPOSE 2004-2005/tcp`, ALPINE)
Expect(inspectOut[0].HostConfig.PublishAllPorts).To(BeTrue()) Expect(inspectOut[0].HostConfig.PublishAllPorts).To(BeTrue())
}) })
It("podman run --net=host --expose includes port in inspect output", func() { It("podman run --net=host --expose includes ports in inspect output", func() {
containerName := "testctr" containerName := "testctr"
session := podmanTest.Podman([]string{"run", "--name", containerName, "-d", "--expose", "8080/tcp", NGINX_IMAGE, "sleep", "+inf"}) session := podmanTest.Podman([]string{"run", "--net=host", "--name", containerName, "-d", "--expose", "8080/tcp", NGINX_IMAGE, "sleep", "+inf"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
inspectOut := podmanTest.InspectContainer(containerName) inspectOut := podmanTest.InspectContainer(containerName)
Expect(inspectOut).To(HaveLen(1)) Expect(inspectOut).To(HaveLen(1))
// Ports is empty. ExposedPorts is not.
Expect(inspectOut[0].NetworkSettings.Ports).To(BeEmpty())
// 80 from the image, 8080 from the expose // 80 from the image, 8080 from the expose
Expect(inspectOut[0].NetworkSettings.Ports).To(HaveLen(2)) Expect(inspectOut[0].Config.ExposedPorts).To(HaveLen(2))
Expect(inspectOut[0].NetworkSettings.Ports).To(HaveKey("80/tcp")) Expect(inspectOut[0].Config.ExposedPorts).To(HaveKey("80/tcp"))
Expect(inspectOut[0].NetworkSettings.Ports).To(HaveKey("8080/tcp")) Expect(inspectOut[0].Config.ExposedPorts).To(HaveKey("8080/tcp"))
}) })
It("podman run --net=container --expose exposed port from own container", func() { It("podman run --net=container --expose exposed port from own container", func() {
@ -469,8 +472,10 @@ EXPOSE 2004-2005/tcp`, ALPINE)
inspectOut := podmanTest.InspectContainer(ctr2) inspectOut := podmanTest.InspectContainer(ctr2)
Expect(inspectOut).To(HaveLen(1)) Expect(inspectOut).To(HaveLen(1))
Expect(inspectOut[0].NetworkSettings.Ports).To(HaveLen(1)) // Ports will not be populated. ExposedPorts will be.
Expect(inspectOut[0].NetworkSettings.Ports).To(HaveKey("8090/tcp")) Expect(inspectOut[0].NetworkSettings.Ports).To(BeEmpty())
Expect(inspectOut[0].Config.ExposedPorts).To(HaveLen(1))
Expect(inspectOut[0].Config.ExposedPorts).To(HaveKey("8090/tcp"))
}) })
It("podman run -p 127.0.0.1::8980/udp", func() { It("podman run -p 127.0.0.1::8980/udp", func() {