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/ps | |
| 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/ps')
| -rw-r--r-- | pkg/ps/ps.go | 4 |
1 files changed, 1 insertions, 3 deletions
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 } |