diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-18 16:11:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 16:11:28 +0100 |
| commit | 5dacee93950a97ea14180bb86f21e462101fe5ea (patch) | |
| tree | ac45c90c8581e871cb0ab69ce5a5da1eb85ae650 /cmd/podman/shared | |
| parent | bc20cb9281434a95685bd95de0430a7c40b606e4 (diff) | |
| parent | 3c2cc6786742ae873d7055ea3921ea5243d92898 (diff) | |
| download | podman-5dacee93950a97ea14180bb86f21e462101fe5ea.tar.gz podman-5dacee93950a97ea14180bb86f21e462101fe5ea.tar.bz2 podman-5dacee93950a97ea14180bb86f21e462101fe5ea.zip | |
Merge pull request #5223 from vrothberg/ps-image-id
podman-ps: support image IDs
Diffstat (limited to 'cmd/podman/shared')
| -rw-r--r-- | cmd/podman/shared/container.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go index ff3846e70..b5a1e7104 100644 --- a/cmd/podman/shared/container.go +++ b/cmd/podman/shared/container.go @@ -30,6 +30,7 @@ import ( const ( cidTruncLength = 12 podTruncLength = 12 + iidTruncLength = 12 cmdTruncLength = 17 ) @@ -66,6 +67,7 @@ type BatchContainerStruct struct { type PsContainerOutput struct { ID string Image string + ImageID string Command string Created string Ports string @@ -203,7 +205,7 @@ func NewBatchContainer(r *libpod.Runtime, ctr *libpod.Container, opts PsOptions) status = "Error" } - _, imageName := ctr.Image() + imageID, imageName := ctr.Image() cid := ctr.ID() podID := ctr.PodID() if !opts.NoTrunc { @@ -214,6 +216,9 @@ func NewBatchContainer(r *libpod.Runtime, ctr *libpod.Container, opts PsOptions) if len(command) > cmdTruncLength { command = command[0:cmdTruncLength] + "..." } + if len(imageID) > iidTruncLength { + imageID = imageID[0:iidTruncLength] + } } ports, err := ctr.PortMappings() @@ -223,6 +228,7 @@ func NewBatchContainer(r *libpod.Runtime, ctr *libpod.Container, opts PsOptions) pso.ID = cid pso.Image = imageName + pso.ImageID = imageID pso.Command = command pso.Created = created pso.Ports = portsToString(ports) |