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 /libpod | |
| 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 'libpod')
| -rw-r--r-- | libpod/diff.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libpod/diff.go b/libpod/diff.go index 5bd162e7b..cdd5e79cb 100644 --- a/libpod/diff.go +++ b/libpod/diff.go @@ -1,7 +1,6 @@ package libpod import ( - "github.com/containers/common/libimage" "github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/libpod/layers" "github.com/containers/storage/pkg/archive" @@ -53,7 +52,7 @@ func (r *Runtime) GetDiff(from, to string, diffType define.DiffType) ([]archive. func (r *Runtime) getLayerID(id string, diffType define.DiffType) (string, error) { var lastErr error if diffType&define.DiffImage == define.DiffImage { - toImage, _, err := r.libimageRuntime.LookupImage(id, &libimage.LookupImageOptions{IgnorePlatform: true}) + toImage, _, err := r.libimageRuntime.LookupImage(id, nil) if err == nil { return toImage.TopLayer(), nil } |