From e1ac0c303342f47dd06f861e312c2e4d10136df3 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Fri, 2 Jul 2021 14:37:30 +0200 Subject: 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 --- pkg/api/handlers/libpod/images.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkg/api/handlers/libpod/images.go') diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index fc6ab4b4c..d759f4824 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -11,7 +11,6 @@ import ( "strings" "github.com/containers/buildah" - "github.com/containers/common/libimage" "github.com/containers/common/pkg/filters" "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" @@ -215,8 +214,7 @@ func ExportImage(w http.ResponseWriter, r *http.Request) { } name := utils.GetName(r) - lookupOptions := &libimage.LookupImageOptions{IgnorePlatform: true} - if _, _, err := runtime.LibimageRuntime().LookupImage(name, lookupOptions); err != nil { + if _, _, err := runtime.LibimageRuntime().LookupImage(name, nil); err != nil { utils.ImageNotFound(w, name, err) return } -- cgit v1.2.3-54-g00ecf