Merge pull request #9581 from baude/issue9529

Add network summary to compat ps
This commit is contained in:
OpenShift Merge Robot
2021-03-03 11:13:22 -05:00
committed by GitHub
2 changed files with 21 additions and 1 deletions

View File

@ -321,6 +321,19 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
Type: portMapping.Protocol,
}
}
inspect, err := l.Inspect(false)
if err != nil {
return nil, err
}
n, err := json.Marshal(inspect.NetworkSettings)
if err != nil {
return nil, err
}
networkSettings := types.SummaryNetworkSettings{}
if err := json.Unmarshal(n, &networkSettings); err != nil {
return nil, err
}
return &handlers.Container{Container: types.Container{
ID: l.ID(),
@ -339,7 +352,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
NetworkMode string `json:",omitempty"`
}{
"host"},
NetworkSettings: nil,
NetworkSettings: &networkSettings,
Mounts: nil,
},
ContainerCreateConfig: types.ContainerCreateConfig{},