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 /pkg/api/handlers/compat | |
| 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 'pkg/api/handlers/compat')
| -rw-r--r-- | pkg/api/handlers/compat/images_history.go | 4 | ||||
| -rw-r--r-- | pkg/api/handlers/compat/images_tag.go | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pkg/api/handlers/compat/images_history.go b/pkg/api/handlers/compat/images_history.go index ea596890f..54c893f47 100644 --- a/pkg/api/handlers/compat/images_history.go +++ b/pkg/api/handlers/compat/images_history.go @@ -3,7 +3,6 @@ package compat import ( "net/http" - "github.com/containers/common/libimage" "github.com/containers/podman/v3/libpod" "github.com/containers/podman/v3/pkg/api/handlers" "github.com/containers/podman/v3/pkg/api/handlers/utils" @@ -14,8 +13,7 @@ func HistoryImage(w http.ResponseWriter, r *http.Request) { runtime := r.Context().Value("runtime").(*libpod.Runtime) name := utils.GetName(r) - lookupOptions := &libimage.LookupImageOptions{IgnorePlatform: true} - newImage, _, err := runtime.LibimageRuntime().LookupImage(name, lookupOptions) + newImage, _, err := runtime.LibimageRuntime().LookupImage(name, nil) if err != nil { utils.Error(w, "Something went wrong.", http.StatusNotFound, errors.Wrapf(err, "failed to find image %s", name)) return diff --git a/pkg/api/handlers/compat/images_tag.go b/pkg/api/handlers/compat/images_tag.go index 8d256f4fa..199ad0488 100644 --- a/pkg/api/handlers/compat/images_tag.go +++ b/pkg/api/handlers/compat/images_tag.go @@ -4,7 +4,6 @@ import ( "fmt" "net/http" - "github.com/containers/common/libimage" "github.com/containers/podman/v3/libpod" "github.com/containers/podman/v3/pkg/api/handlers/utils" "github.com/pkg/errors" @@ -16,8 +15,7 @@ func TagImage(w http.ResponseWriter, r *http.Request) { // /v1.xx/images/(name)/tag name := utils.GetName(r) - lookupOptions := &libimage.LookupImageOptions{IgnorePlatform: true} - newImage, _, err := runtime.LibimageRuntime().LookupImage(name, lookupOptions) + newImage, _, err := runtime.LibimageRuntime().LookupImage(name, nil) if err != nil { utils.ImageNotFound(w, name, errors.Wrapf(err, "failed to find image %s", name)) return |