Merge pull request #2784 from QiWang19/digest

fix bug remote-podman images --digests
containers · Mar 28, 2019 · df5b6e2 · df5b6e2
2 parents 9085898 + fd7a9c4
commit df5b6e2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/API.md b/API.md
@@ -1472,6 +1472,8 @@ gid_map [IDMap](#IDMap)
 
 id [string](https://godoc.org/builtin#string)
 
+digest [string](https://godoc.org/builtin#string)
+
 parentId [string](https://godoc.org/builtin#string)
 
 repoTags [[]string](#[]string)

diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
@@ -59,6 +59,7 @@ type VolumeRemoveOpts (
 
 type Image (
   id: string,
+  digest:   string,
   parentId: string,
   repoTags: []string,
   repoDigests: []string,

diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go
@@ -137,6 +137,7 @@ func imageInListToContainerImage(i iopodman.Image, name string, runtime *LocalRu
 	ri := remoteImage{
 		InputName:   name,
 		ID:          i.Id,
+		Digest:      digest.Digest(i.Digest),
 		Labels:      i.Labels,
 		RepoTags:    i.RepoTags,
 		RepoDigests: i.RepoTags,

diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go
@@ -54,6 +54,7 @@ func (i *LibpodAPI) ListImages(call iopodman.VarlinkCall) error {
 
 		i := iopodman.Image{
 			Id:          image.ID(),
+			Digest:      string(image.Digest()),
 			ParentId:    image.Parent,
 			RepoTags:    image.Names(),
 			RepoDigests: repoDigests,