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/api/handlers/utils | |
| 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/api/handlers/utils')
| -rw-r--r-- | pkg/api/handlers/utils/images.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go index 2a1908d63..1e8edb6dd 100644 --- a/pkg/api/handlers/utils/images.go +++ b/pkg/api/handlers/utils/images.go @@ -88,8 +88,7 @@ func GetImages(w http.ResponseWriter, r *http.Request) ([]*libimage.Image, error func GetImage(r *http.Request, name string) (*libimage.Image, error) { runtime := r.Context().Value("runtime").(*libpod.Runtime) - lookupOptions := &libimage.LookupImageOptions{IgnorePlatform: true} - image, _, err := runtime.LibimageRuntime().LookupImage(name, lookupOptions) + image, _, err := runtime.LibimageRuntime().LookupImage(name, nil) if err != nil { return nil, err } |