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

Merge pull request #9829 from rhatdan/rmi

Browse Source 
[NO TESTS NEEDED] Use same function podman-remote rmi as podman
This commit is contained in:
OpenShift Merge Robot
2021-03-28 17:07:45 +00:00
committed by GitHub
parent 7e4b13b946 eb82c48cc5
commit ccbe7e9456
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/api/handlers/compat/images_remove.go
View File

@ -4,7 +4,10 @@ import (
"net/http" "net/http"
"github.com/containers/podman/v3/libpod" "github.com/containers/podman/v3/libpod"
"github.com/containers/podman/v3/libpod/define"
"github.com/containers/podman/v3/pkg/api/handlers/utils" "github.com/containers/podman/v3/pkg/api/handlers/utils"
"github.com/containers/podman/v3/pkg/domain/entities"
"github.com/containers/podman/v3/pkg/domain/infra/abi"
"github.com/gorilla/schema" "github.com/gorilla/schema"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -30,28 +33,32 @@ func RemoveImage(w http.ResponseWriter, r *http.Request) {
} }
} }
name := utils.GetName(r) name := utils.GetName(r)
newImage, err := runtime.ImageRuntime().NewFromLocal(name) imageEngine := abi.ImageEngine{Libpod: runtime}
if err != nil {
utils.ImageNotFound(w, name, errors.Wrapf(err, "failed to find image %s", name)) options := entities.ImageRemoveOptions{
return Force: query.Force,
} }
report, rmerrors := imageEngine.Remove(r.Context(), []string{name}, options)
if len(rmerrors) > 0 && rmerrors[0] != nil {
err := rmerrors[0]
if errors.Cause(err) == define.ErrNoSuchImage {
utils.ImageNotFound(w, name, errors.Wrapf(err, "failed to find image %s", name))
return
}
results, err := runtime.RemoveImage(r.Context(), newImage, query.Force)
if err != nil {
utils.Error(w, "Something went wrong.", http.StatusInternalServerError, err) utils.Error(w, "Something went wrong.", http.StatusInternalServerError, err)
return return
} }
response := make([]map[string]string, 0, len(report.Untagged)+1)
response := make([]map[string]string, 0, len(results.Untagged)+1) for _, d := range report.Deleted {
deleted := make(map[string]string, 1) deleted := make(map[string]string, 1)
deleted["Deleted"] = results.Deleted deleted["Deleted"] = d
response = append(response, deleted) response = append(response, deleted)
}
for _, u := range results.Untagged { for _, u := range report.Untagged {
untagged := make(map[string]string, 1) untagged := make(map[string]string, 1)
untagged["Untagged"] = u untagged["Untagged"] = u
response = append(response, untagged) response = append(response, untagged)
} }
utils.WriteResponse(w, http.StatusOK, response) utils.WriteResponse(w, http.StatusOK, response)
} }