opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 09:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6264 from baude/v2rmi

Browse Source 
v2endpoint remove image path correction
This commit is contained in:
OpenShift Merge Robot
2020-05-18 17:34:38 +02:00
committed by GitHub
parent bfcec3203e fe16f8f67a
commit d4587c6074
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/server/register_images.go
View File

@ -854,7 +854,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// 500: // 500:
// $ref: '#/responses/InternalError' // $ref: '#/responses/InternalError'
r.Handle(VersionedPath("/libpod/images/remove"), s.APIHandler(libpod.ImagesBatchRemove)).Methods(http.MethodDelete) 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: // tags:
// - images // - images
@ -883,7 +883,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
// $ref: '#/responses/ConflictError' // $ref: '#/responses/ConflictError'
// 500: // 500:
// $ref: '#/responses/InternalError' // $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 // swagger:operation POST /libpod/images/pull libpod libpodImagesPull
// --- // ---
// tags: // tags:

2
pkg/bindings/images/rm.go
View File

@ -52,7 +52,7 @@ func Remove(ctx context.Context, nameOrID string, force bool) (*entities.ImageRe
params := url.Values{} params := url.Values{}
params.Set("force", strconv.FormatBool(force)) 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 { if err != nil {
return nil, err return nil, err
} }