kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

make commands use the correct routes

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-05-09 22:28:52 -07:00
parent 15ae314cbb
commit 1941c79195
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api.go
View file

@ -567,8 +567,8 @@ func ListenAndServe(addr string, srv *Server, logging bool) error {
"/commit": postCommit,
"/build": postBuild,
"/images/create": postImagesCreate,
"/images/{name:*.}/insert": postImagesInsert,
"/images/{name:*.}/push": postImagesPush,
"/images/{name:.*}/insert": postImagesInsert,
"/images/{name:.*}/push": postImagesPush,
"/images/{name:.*}/tag": postImagesTag,
"/containers/create": postContainersCreate,
"/containers/{name:.*}/kill": postContainersKill,

11
commands.go
View file

@ -588,7 +588,7 @@ func CmdImport(args ...string) error {
v.Set("tag", tag)
v.Set("fromSrc", src)
err := hijack("POST", "/images?"+v.Encode(), false)
err := hijack("POST", "/images/create?"+v.Encode(), false)
if err != nil {
return err
}
@ -645,8 +645,7 @@ func CmdPush(args ...string) error {
v := url.Values{}
v.Set("registry", *registry)
if err := hijack("POST", "/images"+name+"/push?"+v.Encode(), false); err != nil {
if err := hijack("POST", "/images/"+name+"/push?"+v.Encode(), false); err != nil {
return err
}
return nil
@ -677,7 +676,7 @@ func CmdPull(args ...string) error {
v.Set("tag", *tag)
v.Set("registry", *registry)
if err := hijack("POST", "/images?"+v.Encode(), false); err != nil {
if err := hijack("POST", "/images/create?"+v.Encode(), false); err != nil {
return err
}
@ -716,7 +715,7 @@ func CmdImages(args ...string) error {
v.Set("all", "1")
}
body, _, err := call("GET", "/images?"+v.Encode(), nil)
body, _, err := call("GET", "/images/json?"+v.Encode(), nil)
if err != nil {
return err
}
@ -1244,12 +1243,12 @@ func hijack(method, path string, setRawTerminal bool) error {
if err := <-receiveStdout; err != nil {
return err
}
if !term.IsTerminal(int(os.Stdin.Fd())) {
if err := <-sendStdin; err != nil {
return err
}
}
return nil
}