opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 16:47:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reformat inspect network settings

Browse Source 
Reformat ports of inspect network settings to compatible with docker inspect. Close #5380

Signed-off-by: Qi Wang <qiwan@redhat.com>
This commit is contained in:
Qi Wang
2020-06-23 11:29:11 -04:00
parent 81f4204e4e
commit f586c006f8
3 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libpod/networking_linux.go
View File

@ -587,10 +587,20 @@ func getContainerNetIO(ctr *Container) (*netlink.LinkStatistics, error) {
// network.
func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, error) {
settings := new(define.InspectNetworkSettings)
settings.Ports = []ocicni.PortMapping{}
settings.Ports = make(map[string][]define.InspectHostPort)
if c.config.PortMappings != nil {
// TODO: This may not be safe.
settings.Ports = c.config.PortMappings
for _, port := range c.config.PortMappings {
key := fmt.Sprintf("%d/%s", port.ContainerPort, port.Protocol)
mapping := settings.Ports[key]
if mapping == nil {
mapping = []define.InspectHostPort{}
}
mapping = append(mapping, define.InspectHostPort{
HostIP: port.HostIP,
HostPort: fmt.Sprintf("%d", port.HostPort),
})
settings.Ports[key] = mapping
}
}
// We can't do more if the network is down.