summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-18 17:34:38 +0200
committerGitHub <noreply@github.com>2020-05-18 17:34:38 +0200
commitd4587c6074e4b4e3673cf495f0c4cd2811742791 (patch)
tree95fbc4fb4f8e2100e43f072018135c96a2d65d8e
parentbfcec3203ea517f408ad90d42789fb6eb62e7d81 (diff)
parentfe16f8f67ae80c691e6068ecb642e96673571632 (diff)
downloadpodman-d4587c6074e4b4e3673cf495f0c4cd2811742791.tar.gz
podman-d4587c6074e4b4e3673cf495f0c4cd2811742791.tar.bz2
podman-d4587c6074e4b4e3673cf495f0c4cd2811742791.zip
Merge pull request #6264 from baude/v2rmi
v2endpoint remove image path correction
-rw-r--r--pkg/api/server/register_images.go4
-rw-r--r--pkg/bindings/images/rm.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go
index 0e8d68b7e..36f939779 100644
--- a/pkg/api/server/register_images.go
+++ b/pkg/api/server/register_images.go
@@ -854,7 +854,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// 500:
// $ref: '#/responses/InternalError'
r.Handle(VersionedPath("/libpod/images/remove"), s.APIHandler(libpod.ImagesBatchRemove)).Methods(http.MethodDelete)
- // swagger:operation DELETE /libpod/images/{name:.*}/remove libpod libpodRemoveImage
+ // swagger:operation DELETE /libpod/images/{name:.*} libpod libpodRemoveImage
// ---
// tags:
// - images
@@ -883,7 +883,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// $ref: '#/responses/ConflictError'
// 500:
// $ref: '#/responses/InternalError'
- r.Handle(VersionedPath("/libpod/images/{name:.*}/remove"), s.APIHandler(libpod.ImagesRemove)).Methods(http.MethodDelete)
+ r.Handle(VersionedPath("/libpod/images/{name:.*}"), s.APIHandler(libpod.ImagesRemove)).Methods(http.MethodDelete)
// swagger:operation POST /libpod/images/pull libpod libpodImagesPull
// ---
// tags:
diff --git a/pkg/bindings/images/rm.go b/pkg/bindings/images/rm.go
index e3b5590df..05aa3f9ca 100644
--- a/pkg/bindings/images/rm.go
+++ b/pkg/bindings/images/rm.go
@@ -52,7 +52,7 @@ func Remove(ctx context.Context, nameOrID string, force bool) (*entities.ImageRe
params := url.Values{}
params.Set("force", strconv.FormatBool(force))
- response, err := conn.DoRequest(nil, http.MethodDelete, "/images/%s/remove", params, nameOrID)
+ response, err := conn.DoRequest(nil, http.MethodDelete, "/images/%s", params, nameOrID)
if err != nil {
return nil, err
}