diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-24 16:25:56 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-27 09:51:26 -0400 |
| commit | a83d1a27721162757808bc6c4f365ba1d2ec7510 (patch) | |
| tree | d4c38342f68e55560905c9ededaf7a2416aaffa4 /pkg | |
| parent | fdf64f0c66be4569732b830ce60c98f98a7efe64 (diff) | |
| download | podman-a83d1a27721162757808bc6c4f365ba1d2ec7510.tar.gz podman-a83d1a27721162757808bc6c4f365ba1d2ec7510.tar.bz2 podman-a83d1a27721162757808bc6c4f365ba1d2ec7510.zip | |
Make podman container list == podman ps
Also make
podman create -p PUBLISHPorts
work.
This PR fixes ps_test.go
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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 709bb58d6..7f69eec0c 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(), |