docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better error 

Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2015-03-11 14:27:00 -07:00 committed by Victor Vieux
parent 6044354ea2
commit bc17fbd6f7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/api.go
View File

@ -345,24 +345,25 @@ func deleteImages(c *context, w http.ResponseWriter, r *http.Request) {
} }
} }
size := len(matchedImages) if len(matchedImages) == 0 {
if size == 0 {
httpError(w, fmt.Sprintf("No such image %s", name), http.StatusNotFound) httpError(w, fmt.Sprintf("No such image %s", name), http.StatusNotFound)
return return
} }
out := []*dockerclient.ImageDelete{} out := []*dockerclient.ImageDelete{}
errs := []string{}
for _, image := range matchedImages { for _, image := range matchedImages {
content, err := image.Node.DockerClient().RemoveImage(name) content, err := image.Node.DockerClient().RemoveImage(name)
if err != nil { if err != nil {
out = nil errs = append(errs, fmt.Sprintf("%s: %s", image.Node.Name(), err.Error()))
httpError(w, err.Error(), http.StatusInternalServerError)
continue continue
} }
out = append(out, content...) out = append(out, content...)
} }
if out != nil { if len(errs) != 0 {
httpError(w, strings.Join(errs, ""), http.StatusInternalServerError)
} else {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
json.NewEncoder(NewWriteFlusher(w)).Encode(out) json.NewEncoder(NewWriteFlusher(w)).Encode(out)
} }