diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-30 17:18:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-30 17:18:57 +0200 |
| commit | 0a394876bebca48b74f4bad6647ac5ec49187e85 (patch) | |
| tree | 05d52823d1077ad2f24b618a4b07fc9cb75a2e59 /libpod | |
| parent | 3feb56e159a3f1faf52a1df7bcc2025e32fd4ca9 (diff) | |
| parent | 02b0f9fc393ab7bcbc1d555ac4386899daad59fd (diff) | |
| download | podman-0a394876bebca48b74f4bad6647ac5ec49187e85.tar.gz podman-0a394876bebca48b74f4bad6647ac5ec49187e85.tar.bz2 podman-0a394876bebca48b74f4bad6647ac5ec49187e85.zip | |
Merge pull request #16010 from vrothberg/container-inspect
container inspect: include image digest
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_inspect.go | 9 | ||||
| -rw-r--r-- | libpod/define/container_inspect.go | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index e4089efa6..4dc1ca3a5 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -166,6 +166,15 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver IsInfra: c.IsInfra(), IsService: c.IsService(), } + + if config.RootfsImageID != "" { // May not be set if the container was created with --rootfs + image, _, err := c.runtime.libimageRuntime.LookupImage(config.RootfsImageID, nil) + if err != nil { + return nil, err + } + data.ImageDigest = image.Digest().String() + } + if ctrSpec.Process.Capabilities != nil { data.EffectiveCaps = ctrSpec.Process.Capabilities.Effective data.BoundingCaps = ctrSpec.Process.Capabilities.Bounding diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index da5c58f27..7a00d708c 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -659,6 +659,7 @@ type InspectContainerData struct { Args []string `json:"Args"` State *InspectContainerState `json:"State"` Image string `json:"Image"` + ImageDigest string `json:"ImageDigest"` ImageName string `json:"ImageName"` Rootfs string `json:"Rootfs"` Pod string `json:"Pod"` |