summaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-04 15:48:20 -0500
committerGitHub <noreply@github.com>2020-12-04 15:48:20 -0500
commitb6536d20ed131783b0761d1fdb38b0c1db2bf01e (patch)
tree5c73fd0c7d13ca1752930f81f17eb65a64eaa43e /pkg/domain/infra
parent07af857961a2d09990ef39e188ec7bb6fdf75147 (diff)
parent15d36f120c55162ace481f730588159b089780bf (diff)
downloadpodman-b6536d20ed131783b0761d1fdb38b0c1db2bf01e.tar.gz
podman-b6536d20ed131783b0761d1fdb38b0c1db2bf01e.tar.bz2
podman-b6536d20ed131783b0761d1fdb38b0c1db2bf01e.zip
Merge pull request #8494 from mlegenovic/master
More docker compat API fixes
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r--pkg/domain/infra/abi/images_list.go11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go
index 20ae0d0f6..c4b0b7712 100644
--- a/pkg/domain/infra/abi/images_list.go
+++ b/pkg/domain/infra/abi/images_list.go
@@ -38,10 +38,8 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
RepoDigests: digests,
History: img.NamesHistory(),
Names: img.Names(),
- ParentId: img.Parent,
ReadOnly: img.IsReadOnly(),
SharedSize: 0,
- VirtualSize: img.VirtualSize,
RepoTags: img.Names(), // may include tags and digests
}
e.Labels, err = img.Labels(ctx)
@@ -60,6 +58,15 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
return nil, errors.Wrapf(err, "error retrieving size of image %q: you may need to remove the image to resolve the error", img.ID())
}
e.Size = int64(*sz)
+ // This is good enough for now, but has to be
+ // replaced later with correct calculation logic
+ e.VirtualSize = int64(*sz)
+
+ parent, err := img.ParentID(ctx)
+ if err != nil {
+ return nil, errors.Wrapf(err, "error retrieving parent of image %q: you may need to remove the image to resolve the error", img.ID())
+ }
+ e.ParentId = parent
summaries = append(summaries, &e)
}