summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/abi
diff options
context:
space:
mode:
authorValentin Rothberg <vrothberg@redhat.com>2022-04-14 10:56:16 +0200
committerValentin Rothberg <vrothberg@redhat.com>2022-04-14 10:58:36 +0200
commit97f93dc78e61820196f2adcc06ab8ec145ef6703 (patch)
tree396be784c2b61b0eaf2031de65fa6de870b79748 /pkg/domain/infra/abi
parent8586b4856fb2b3de8aed45300ce8ec324f5f6bcd (diff)
downloadpodman-97f93dc78e61820196f2adcc06ab8ec145ef6703.tar.gz
podman-97f93dc78e61820196f2adcc06ab8ec145ef6703.tar.bz2
podman-97f93dc78e61820196f2adcc06ab8ec145ef6703.zip
Revert "images --size"
This reverts commit e133a06d2f4a3e94bfbd60b647046f2f515c9c24. @nalind found a proper fix in c/storage [1] to address the performance issue. So we really don't need the flag anymore. Note the flag has never made it into any release. [1] https://github.com/containers/storage/commit/d76b3606fc9ca975bf436379f91105f0fac1555f Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
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 {