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_remove.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_remove.go')
| -rw-r--r-- | pkg/api/handlers/compat/images_remove.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/images_remove.go b/pkg/api/handlers/compat/images_remove.go index 2dc247c1f..5c06d8de0 100644 --- a/pkg/api/handlers/compat/images_remove.go +++ b/pkg/api/handlers/compat/images_remove.go @@ -34,12 +34,18 @@ func RemoveImage(w http.ResponseWriter, r *http.Request) { } } name := utils.GetName(r) + possiblyNormalizedName, err := utils.NormalizeToDockerHub(r, name) + if err != nil { + utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "error normalizing image")) + return + } + imageEngine := abi.ImageEngine{Libpod: runtime} options := entities.ImageRemoveOptions{ Force: query.Force, } - report, rmerrors := imageEngine.Remove(r.Context(), []string{name}, options) + report, rmerrors := imageEngine.Remove(r.Context(), []string{possiblyNormalizedName}, options) if len(rmerrors) > 0 && rmerrors[0] != nil { err := rmerrors[0] if errors.Cause(err) == storage.ErrImageUnknown { |