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

Fix issue #6803 Container inspect endpoint returns null for NetworkSettings/Ports

Browse Source 
Implement mapping for NetworkSettings/Ports for Container inspect endpoint

Signed-off-by: Sami Korhonen <skorhone@gmail.com>
This commit is contained in:
Korhonen Sami (Samlink)
2020-07-03 13:00:21 +03:00
parent c131567401
commit e5bf56a48d
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/api/handlers/compat/containers.go
View File

@ -321,17 +321,17 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
stopTimeout := int(l.StopTimeout()) stopTimeout := int(l.StopTimeout())
ports := make(nat.PortSet) exposedPorts := make(nat.PortSet)
for p := range inspect.HostConfig.PortBindings { for ep := range inspect.HostConfig.PortBindings {
splitp := strings.SplitN(p, "/", 2) splitp := strings.SplitN(ep, "/", 2)
if len(splitp) != 2 { if len(splitp) != 2 {
return nil, errors.Errorf("PORT/PROTOCOL Format required for %q", p) return nil, errors.Errorf("PORT/PROTOCOL Format required for %q", ep)
} }
port, err := nat.NewPort(splitp[1], splitp[0]) exposedPort, err := nat.NewPort(splitp[1], splitp[0])
if err != nil { if err != nil {
return nil, err return nil, err
} }
ports[port] = struct{}{} exposedPorts[exposedPort] = struct{}{}
} }
config := container.Config{ config := container.Config{
@ -341,7 +341,7 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
AttachStdin: inspect.Config.AttachStdin, AttachStdin: inspect.Config.AttachStdin,
AttachStdout: inspect.Config.AttachStdout, AttachStdout: inspect.Config.AttachStdout,
AttachStderr: inspect.Config.AttachStderr, AttachStderr: inspect.Config.AttachStderr,
ExposedPorts: ports, ExposedPorts: exposedPorts,
Tty: inspect.Config.Tty, Tty: inspect.Config.Tty,
OpenStdin: inspect.Config.OpenStdin, OpenStdin: inspect.Config.OpenStdin,
StdinOnce: inspect.Config.StdinOnce, StdinOnce: inspect.Config.StdinOnce,
@ -371,6 +371,15 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
return nil, err return nil, err
} }
p, err := json.Marshal(inspect.NetworkSettings.Ports)
if err != nil {
return nil, err
}
ports := nat.PortMap{}
if err := json.Unmarshal(p, &ports); err != nil {
return nil, err
}
networkSettingsDefault := types.DefaultNetworkSettings{ networkSettingsDefault := types.DefaultNetworkSettings{
EndpointID: "", EndpointID: "",
Gateway: "", Gateway: "",
@ -382,8 +391,12 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*types.ContainerJSON,
MacAddress: l.Config().StaticMAC.String(), MacAddress: l.Config().StaticMAC.String(),
} }
networkSettingsBase := types.NetworkSettingsBase{
Ports: ports,
}
networkSettings := types.NetworkSettings{ networkSettings := types.NetworkSettings{
NetworkSettingsBase: types.NetworkSettingsBase{}, NetworkSettingsBase: networkSettingsBase,
DefaultNetworkSettings: networkSettingsDefault, DefaultNetworkSettings: networkSettingsDefault,
Networks: nil, Networks: nil,
} }