diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-28 16:51:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 16:51:31 -0700 |
| commit | df5b6e29a66fa78f50fed20b273873fd5522f37e (patch) | |
| tree | 47b4415bd3f75c777393c85d276f8d10a2b4b3a0 | |
| parent | 9085898ce2d42bf872c137e981202820066736c7 (diff) | |
| parent | fd7a9c4a9623fc44534d9e63cbd23c8b1920b897 (diff) | |
| download | podman-df5b6e29a66fa78f50fed20b273873fd5522f37e.tar.gz podman-df5b6e29a66fa78f50fed20b273873fd5522f37e.tar.bz2 podman-df5b6e29a66fa78f50fed20b273873fd5522f37e.zip | |
Merge pull request #2784 from QiWang19/digest
fix bug remote-podman images --digests
| -rwxr-xr-x | API.md | 2 | ||||
| -rw-r--r-- | cmd/podman/varlink/io.podman.varlink | 1 | ||||
| -rw-r--r-- | pkg/adapter/runtime_remote.go | 1 | ||||
| -rw-r--r-- | pkg/varlinkapi/images.go | 1 |
4 files changed, 5 insertions, 0 deletions
@@ -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 index ad2de56f8..5e996f46b 100644 --- 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 index 6c53d0c62..dcc2d5aa6 100644 --- 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 index 23ea24a7a..0ca867410 100644 --- 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, |