diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-30 16:30:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 16:30:23 +0100 |
| commit | 771f8c628bef17eb183efce8c7ee7a91cbf4087b (patch) | |
| tree | adad2324e3c5f094785a411cb537d8f922a3fafc /pkg/api/handlers/compat/images_history.go | |
| parent | 8de68b170716dd1293c5a044f3e9cfd962fdbfb1 (diff) | |
| parent | 5bdd571b1e46f26e23f030456efb009cbb765e4c (diff) | |
| download | podman-771f8c628bef17eb183efce8c7ee7a91cbf4087b.tar.gz podman-771f8c628bef17eb183efce8c7ee7a91cbf4087b.tar.bz2 podman-771f8c628bef17eb183efce8c7ee7a91cbf4087b.zip | |
Merge pull request #12435 from vrothberg/fix-12320
compat API: allow enforcing short-names resolution to Docker Hub
Diffstat (limited to 'pkg/api/handlers/compat/images_history.go')
| -rw-r--r-- | pkg/api/handlers/compat/images_history.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/images_history.go b/pkg/api/handlers/compat/images_history.go index 0c6b9fa88..fb3c2ebd2 100644 --- a/pkg/api/handlers/compat/images_history.go +++ b/pkg/api/handlers/compat/images_history.go @@ -14,9 +14,15 @@ func HistoryImage(w http.ResponseWriter, r *http.Request) { runtime := r.Context().Value(api.RuntimeKey).(*libpod.Runtime) name := utils.GetName(r) - newImage, _, err := runtime.LibimageRuntime().LookupImage(name, nil) + possiblyNormalizedName, err := utils.NormalizeToDockerHub(r, name) if err != nil { - utils.Error(w, "Something went wrong.", http.StatusNotFound, errors.Wrapf(err, "failed to find image %s", name)) + utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "error normalizing image")) + return + } + + newImage, _, err := runtime.LibimageRuntime().LookupImage(possiblyNormalizedName, nil) + if err != nil { + utils.ImageNotFound(w, possiblyNormalizedName, errors.Wrapf(err, "failed to find image %s", possiblyNormalizedName)) return } history, err := newImage.History(r.Context()) |