diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-10 05:31:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-10 05:31:11 -0500 |
| commit | bc0fa658f7617454673f8e2faf9298bef2890ea0 (patch) | |
| tree | e5eec82d1489e353c625907e9f6745c4c6dc6274 /pkg/ps | |
| parent | 49db79e735acd2c693762eaff62680cd9a8cb60b (diff) | |
| parent | 82bce7d906c5b5aa1d98782bed8d5e77637fc0ef (diff) | |
| download | podman-bc0fa658f7617454673f8e2faf9298bef2890ea0.tar.gz podman-bc0fa658f7617454673f8e2faf9298bef2890ea0.tar.bz2 podman-bc0fa658f7617454673f8e2faf9298bef2890ea0.zip | |
Merge pull request #8920 from Luap99/ps-network-filter
podman ps/pod ps add network filter and .Networks format placeholder
Diffstat (limited to 'pkg/ps')
| -rw-r--r-- | pkg/ps/ps.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index 9e0dcb728..dc577890a 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -178,6 +178,11 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities return entities.ListContainer{}, err } + networks, _, err := ctr.Networks() + if err != nil { + return entities.ListContainer{}, err + } + ps := entities.ListContainer{ AutoRemove: ctr.AutoRemove(), Command: conConfig.Command, @@ -192,6 +197,7 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities Labels: conConfig.Labels, Mounts: ctr.UserVolumes(), Names: []string{conConfig.Name}, + Networks: networks, Pid: pid, Pod: conConfig.Pod, Ports: portMappings, |