summaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-01-11 17:13:53 -0500
committerGitHub <noreply@github.com>2021-01-11 17:13:53 -0500
commita6510892635d57dfcfbacbe910155e380612b057 (patch)
tree20d62dc5d6cade82830a2741ef419d938c0eace9 /pkg/domain/infra
parent63d8f535ec93b5e83257e39b9d656747c4bedfcc (diff)
parent1d7e5227f874dc3d2511a73a6f3d69550e62b303 (diff)
downloadpodman-a6510892635d57dfcfbacbe910155e380612b057.tar.gz
podman-a6510892635d57dfcfbacbe910155e380612b057.tar.bz2
podman-a6510892635d57dfcfbacbe910155e380612b057.zip
Merge pull request #8934 from vrothberg/fix-8931
image list: ignore bare manifest list
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r--pkg/domain/infra/abi/images_list.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go
index c4b0b7712..2d3b9f36a 100644
--- a/pkg/domain/infra/abi/images_list.go
+++ b/pkg/domain/infra/abi/images_list.go
@@ -44,7 +44,10 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
}
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())
+ // Ignore empty manifest lists.
+ if errors.Cause(err) != libpodImage.ErrImageIsBareList {
+ 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, err := img.Containers()