diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-27 21:27:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 21:27:49 +0200 |
| commit | 8642e256f2036f4263b9817322cde7eec8b0915c (patch) | |
| tree | 32d83f5e9128e7daab4280d2053ebbef7fd558c0 /pkg | |
| parent | 618d4be212ab42e07b3f98e75412529025b37b71 (diff) | |
| parent | a83d1a27721162757808bc6c4f365ba1d2ec7510 (diff) | |
| download | podman-8642e256f2036f4263b9817322cde7eec8b0915c.tar.gz podman-8642e256f2036f4263b9817322cde7eec8b0915c.tar.bz2 podman-8642e256f2036f4263b9817322cde7eec8b0915c.zip | |
Merge pull request #5978 from rhatdan/ports
Make podman container list == podman ps
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/domain/entities/container_ps.go | 2 | ||||
| -rw-r--r-- | pkg/ps/ps.go | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkg/domain/entities/container_ps.go b/pkg/domain/entities/container_ps.go index d5159fb85..fd94d93be 100644 --- a/pkg/domain/entities/container_ps.go +++ b/pkg/domain/entities/container_ps.go @@ -25,6 +25,8 @@ type ListContainer struct { ID string `json:"Id"` // Container image Image string + // Container image ID + ImageID string // If this container is a Pod infra container IsInfra bool // Labels for container diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index d0fef65c8..907063df9 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -158,6 +158,7 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities ExitedAt: exitedTime.Unix(), ID: conConfig.ID, Image: conConfig.RootfsImageName, + ImageID: conConfig.RootfsImageID, IsInfra: conConfig.IsInfra, Labels: conConfig.Labels, Mounts: ctr.UserVolumes(), |