opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8151 from vrothberg/fix-8148

Browse Source 
image list: check for all errors
This commit is contained in:
OpenShift Merge Robot
2020-10-27 14:29:41 +01:00
committed by GitHub
parent 5c0849534d 65fabcfce7
commit 0f0d857f6c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/domain/infra/abi/images_list.go
View File

@ -5,6 +5,7 @@ import (
libpodImage "github.com/containers/podman/v2/libpod/image" libpodImage "github.com/containers/podman/v2/libpod/image"
"github.com/containers/podman/v2/pkg/domain/entities" "github.com/containers/podman/v2/pkg/domain/entities"
"github.com/pkg/errors"
) )
func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ([]*entities.ImageSummary, error) { func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ([]*entities.ImageSummary, error) {
@ -43,12 +44,21 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
VirtualSize: img.VirtualSize, VirtualSize: img.VirtualSize,
RepoTags: img.Names(), // may include tags and digests RepoTags: img.Names(), // may include tags and digests
} }
e.Labels, _ = img.Labels(context.TODO()) e.Labels, err = img.Labels(ctx)
if err != nil {
return nil, errors.Wrapf(err, "error retrieving label for image %q: you may need to remove the image to resolve the error", img.ID())
}
ctnrs, _ := img.Containers() ctnrs, err := img.Containers()
if err != nil {
return nil, errors.Wrapf(err, "error retrieving containers for image %q: you may need to remove the image to resolve the error", img.ID())
}
e.Containers = len(ctnrs) e.Containers = len(ctnrs)
sz, _ := img.Size(context.TODO()) sz, err := img.Size(ctx)
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 = int64(*sz) e.Size = int64(*sz)
summaries = append(summaries, &e) summaries = append(summaries, &e)