diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-16 11:12:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 11:12:44 -0400 |
| commit | 68585b01687ca695c010cae84999302d816ec304 (patch) | |
| tree | ec72efcb93835d84cb970e1089fc336cd9cf2f76 /libpod | |
| parent | bc268666356faeb4a2dfb1d19cf507bbf682ccc7 (diff) | |
| parent | e1ac0c303342f47dd06f861e312c2e4d10136df3 (diff) | |
| download | podman-68585b01687ca695c010cae84999302d816ec304.tar.gz podman-68585b01687ca695c010cae84999302d816ec304.tar.bz2 podman-68585b01687ca695c010cae84999302d816ec304.zip | |
Merge pull request #10848 from vrothberg/update-libimage
vendor containers/common@main
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 } |