diff --git a/api.go b/api.go index b3cdb59bc0..cd6697dcd0 100644 --- a/api.go +++ b/api.go @@ -412,7 +412,7 @@ func deleteContainers(srv *Server, w http.ResponseWriter, r *http.Request, vars return nil, fmt.Errorf("Missing parameter") } name := vars["name"] - removeVolume := r.Form.Get("removeVolume") == "1" + removeVolume := r.Form.Get("v") == "1" if err := srv.ContainerDestroy(name, removeVolume); err != nil { return nil, err diff --git a/commands.go b/commands.go index 63a1f3ed36..41b415c3b3 100644 --- a/commands.go +++ b/commands.go @@ -783,7 +783,7 @@ func CmdPs(args ...string) error { v.Set("before", *before) } - body, _, err := call("GET", "/containers?"+v.Encode(), nil) + body, _, err := call("GET", "/containers/ps?"+v.Encode(), nil) if err != nil { return err } @@ -1082,7 +1082,7 @@ func CmdRun(args ...string) error { } //create the container - body, statusCode, err := call("POST", "/containers", *config) + body, statusCode, err := call("POST", "/containers/create", config) //if image not found try to pull it if statusCode == 404 { v := url.Values{} @@ -1091,7 +1091,7 @@ func CmdRun(args ...string) error { if err != nil { return err } - body, _, err = call("POST", "/containers", *config) + body, _, err = call("POST", "/containers/create", config) if err != nil { return err }