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/ps/ps.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pkg/ps') diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go index ef79973d6..54079baa1 100644 --- a/pkg/ps/ps.go +++ b/pkg/ps/ps.go @@ -9,7 +9,6 @@ import ( "strings" "time" - "github.com/containers/common/libimage" "github.com/containers/podman/v3/libpod" "github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/pkg/domain/entities" @@ -272,8 +271,7 @@ func ListStorageContainer(rt *libpod.Runtime, ctr storage.Container) (entities.L imageName := "" if ctr.ImageID != "" { - lookupOptions := &libimage.LookupImageOptions{IgnorePlatform: true} - image, _, err := rt.LibimageRuntime().LookupImage(ctr.ImageID, lookupOptions) + image, _, err := rt.LibimageRuntime().LookupImage(ctr.ImageID, nil) if err != nil { return ps, err } -- cgit v1.2.3-54-g00ecf