summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-11-07 18:16:41 +0100
committerGitHub <noreply@github.com>2019-11-07 18:16:41 +0100
commit769d4218fff311456b0b61b72cad2b21c2dbed0f (patch)
tree8e5d738762f19209683a8cc24a5f9fc3b1c33f2e
parent24efb5e4ebb6fa96219afeac543d33299b6e1491 (diff)
parent5e3e41daee4f51a425b251bf3b2339fbf0628a8e (diff)
downloadpodman-769d4218fff311456b0b61b72cad2b21c2dbed0f.tar.gz
podman-769d4218fff311456b0b61b72cad2b21c2dbed0f.tar.bz2
podman-769d4218fff311456b0b61b72cad2b21c2dbed0f.zip
Merge pull request #4468 from nalind/image-digests
podman images --digest: always list a digest
-rw-r--r--cmd/podman/images.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/podman/images.go b/cmd/podman/images.go
index 6157fda2a..7d498517c 100644
--- a/cmd/podman/images.go
+++ b/cmd/podman/images.go
@@ -291,6 +291,10 @@ func getImagesTemplateOutput(ctx context.Context, images []*adapter.ContainerIma
if len(tag) == 71 && strings.HasPrefix(tag, "sha256:") {
imageDigest = digest.Digest(tag)
tag = ""
+ } else {
+ if img.Digest() != "" {
+ imageDigest = img.Digest()
+ }
}
params := imagesTemplateParams{
Repository: repo,