opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-24 15:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17197 from vrothberg/ps-network

Browse Source 
ps: get network data in batch mode
This commit is contained in:
OpenShift Merge Robot
2023-01-24 13:01:19 -05:00
committed by GitHub
parent ce504bbfe3 6f519c9bde
commit eefc8b65b1
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/ps/ps.go
View File

@ -11,6 +11,7 @@ import (
"strings" "strings"
"time" "time"
libnetworkTypes "github.com/containers/common/libnetwork/types"
"github.com/containers/podman/v4/libpod" "github.com/containers/podman/v4/libpod"
"github.com/containers/podman/v4/libpod/define" "github.com/containers/podman/v4/libpod/define"
"github.com/containers/podman/v4/pkg/domain/entities" "github.com/containers/podman/v4/pkg/domain/entities"
@ -134,6 +135,8 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
startedTime time.Time startedTime time.Time
exitedTime time.Time exitedTime time.Time
cgroup, ipc, mnt, net, pidns, user, uts string cgroup, ipc, mnt, net, pidns, user, uts string
portMappings []libnetworkTypes.PortMapping
networks []string
) )
batchErr := ctr.Batch(func(c *libpod.Container) error { batchErr := ctr.Batch(func(c *libpod.Container) error {
@ -167,6 +170,16 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
return fmt.Errorf("unable to obtain container pid: %w", err) return fmt.Errorf("unable to obtain container pid: %w", err)
} }
portMappings, err = c.PortMappings()
if err != nil {
return err
}
networks, err = c.Networks()
if err != nil {
return err
}
if !opts.Size && !opts.Namespace { if !opts.Size && !opts.Namespace {
return nil return nil
} }
@ -203,16 +216,6 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
return entities.ListContainer{}, batchErr return entities.ListContainer{}, batchErr
} }
portMappings, err := ctr.PortMappings()
if err != nil {
return entities.ListContainer{}, err
}
networks, err := ctr.Networks()
if err != nil {
return entities.ListContainer{}, err
}
ps := entities.ListContainer{ ps := entities.ListContainer{
AutoRemove: ctr.AutoRemove(), AutoRemove: ctr.AutoRemove(),
Command: conConfig.Command, Command: conConfig.Command,