diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-04 06:23:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 06:23:16 -0500 |
| commit | d1193b1b8ca6da720b5d4eafff5733e367c07578 (patch) | |
| tree | b8700e7e7bfa210052390242a3242af72998fb84 /pkg/domain | |
| parent | a3cb37a04fdcfc6634fd63d746fc7e6fa7850a18 (diff) | |
| parent | 468947d5c85cdd72d604c95789d91075553f0a92 (diff) | |
| download | podman-d1193b1b8ca6da720b5d4eafff5733e367c07578.tar.gz podman-d1193b1b8ca6da720b5d4eafff5733e367c07578.tar.bz2 podman-d1193b1b8ca6da720b5d4eafff5733e367c07578.zip | |
Merge pull request #8587 from jwhonce/jira/RUN-1106-images
Jira RUN-1106 Image handlers updates
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/images.go | 22 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images_list.go | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index ab545d882..81f12bff7 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -51,22 +51,22 @@ func (i *Image) Id() string { // nolint } type ImageSummary struct { - ID string `json:"Id"` - ParentId string // nolint - RepoTags []string `json:",omitempty"` + ID string `json:"Id"` + ParentId string // nolint + RepoTags []string + RepoDigests []string Created int64 - Size int64 `json:",omitempty"` - SharedSize int `json:",omitempty"` - VirtualSize int64 `json:",omitempty"` - Labels map[string]string `json:",omitempty"` - Containers int `json:",omitempty"` - ReadOnly bool `json:",omitempty"` - Dangling bool `json:",omitempty"` + Size int64 + SharedSize int + VirtualSize int64 + Labels map[string]string + Containers int + ReadOnly bool `json:",omitempty"` + Dangling bool `json:",omitempty"` // Podman extensions Names []string `json:",omitempty"` Digest string `json:",omitempty"` - Digests []string `json:",omitempty"` ConfigDigest string `json:",omitempty"` History []string `json:",omitempty"` } diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go index 281b04294..20ae0d0f6 100644 --- a/pkg/domain/infra/abi/images_list.go +++ b/pkg/domain/infra/abi/images_list.go @@ -35,7 +35,7 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) Created: img.Created().Unix(), Dangling: img.Dangling(), Digest: string(img.Digest()), - Digests: digests, + RepoDigests: digests, History: img.NamesHistory(), Names: img.Names(), ParentId: img.Parent, |