toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the routes within commands.go

Browse Source 
Upstream-commit: eeaea4e873a4850a24e300461975e5d9636fef08
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-05-09 20:19:21 -07:00
parent f7a60e000e
commit c97d9c8b66
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/api.go
+1 -1
View File
@@ -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
components/engine/commands.go
+3 -3
View File
@@ -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
}