diff options
| author | Valentin Rothberg <rothberg@redhat.com> | 2021-07-02 14:37:30 +0200 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2021-07-16 14:19:56 +0200 |
| commit | e1ac0c303342f47dd06f861e312c2e4d10136df3 (patch) | |
| tree | 1574e90b3461fae7b511bbea3ee5b38ee11a4054 /pkg/domain/infra/abi/manifest.go | |
| parent | f0cd16cb32676eaf5ee337b50e8628f2f49ccce9 (diff) | |
| download | podman-e1ac0c303342f47dd06f861e312c2e4d10136df3.tar.gz podman-e1ac0c303342f47dd06f861e312c2e4d10136df3.tar.bz2 podman-e1ac0c303342f47dd06f861e312c2e4d10136df3.zip | |
vendor containers/common@main
The `IgnorePlatform` options has been removed from the
`LookupImageOptions` in libimage to properly support multi-arch images.
Skip one buildah-bud test which requires updated CI images. This is
currently being done in github.com/containers/podman/pull/10829 but
we need to unblock merging common and buildah into podman.
[NO TESTS NEEDED]
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/domain/infra/abi/manifest.go')
| -rw-r--r-- | pkg/domain/infra/abi/manifest.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go index e905036be..68e29f006 100644 --- a/pkg/domain/infra/abi/manifest.go +++ b/pkg/domain/infra/abi/manifest.go @@ -47,7 +47,7 @@ func (ir *ImageEngine) ManifestCreate(ctx context.Context, names []string, image // ManifestExists checks if a manifest list with the given name exists in local storage func (ir *ImageEngine) ManifestExists(ctx context.Context, name string) (*entities.BoolReport, error) { - image, _, err := ir.Libpod.LibimageRuntime().LookupImage(name, &libimage.LookupImageOptions{IgnorePlatform: true}) + _, err := ir.Libpod.LibimageRuntime().LookupManifestList(name) if err != nil { if errors.Cause(err) == storage.ErrImageUnknown { return &entities.BoolReport{Value: false}, nil @@ -55,11 +55,7 @@ func (ir *ImageEngine) ManifestExists(ctx context.Context, name string) (*entiti return nil, err } - isManifestList, err := image.IsManifestList(ctx) - if err != nil { - return nil, err - } - return &entities.BoolReport{Value: isManifestList}, nil + return &entities.BoolReport{Value: true}, nil } // ManifestInspect returns the content of a manifest list or image |