summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/abi
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-04-14 07:18:52 -0400
committerGitHub <noreply@github.com>2022-04-14 07:18:52 -0400
commit001f619eab780721abe52ee72fe3c87caa7c652f (patch)
treee221f394a1a3f583f315494ca300160fa52ab2f2 /pkg/domain/infra/abi
parent15712c76fb198cec7509ff0cf401e357401d2d7d (diff)
parent97f93dc78e61820196f2adcc06ab8ec145ef6703 (diff)
downloadpodman-001f619eab780721abe52ee72fe3c87caa7c652f.tar.gz
podman-001f619eab780721abe52ee72fe3c87caa7c652f.tar.bz2
podman-001f619eab780721abe52ee72fe3c87caa7c652f.zip
Merge pull request #13872 from vrothberg/revert-size
Revert "images --size"
Diffstat (limited to 'pkg/domain/infra/abi')
-rw-r--r--pkg/domain/infra/abi/images_list.go16
1 files changed, 7 insertions, 9 deletions
diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go
index 8825f1ac6..9a0aaaf3a 100644
--- a/pkg/domain/infra/abi/images_list.go
+++ b/pkg/domain/infra/abi/images_list.go
@@ -60,16 +60,14 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
}
e.Containers = len(ctnrs)
- if opts.Size {
- sz, err := img.Size()
- if err != nil {
- 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 = sz
- // This is good enough for now, but has to be
- // replaced later with correct calculation logic
- e.VirtualSize = sz
+ sz, err := img.Size()
+ if err != nil {
+ 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 = sz
+ // This is good enough for now, but has to be
+ // replaced later with correct calculation logic
+ e.VirtualSize = sz
parent, err := img.Parent(ctx)
if err != nil {