From 80593d4e7d33700b239c4601a6511a5dd360d309 Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Wed, 15 May 2013 19:21:37 +0000 Subject: [PATCH] Reenable docker push Upstream-commit: 2f4de3867d77f8f8841ba32517f2ca8b9e730113 Component: engine --- components/engine/api.go | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/components/engine/api.go b/components/engine/api.go index 2b8fb81f4c..bdf6393e1c 100644 --- a/components/engine/api.go +++ b/components/engine/api.go @@ -333,26 +333,25 @@ func postImagesInsert(srv *Server, w http.ResponseWriter, r *http.Request, vars } func postImagesPush(srv *Server, w http.ResponseWriter, r *http.Request, vars map[string]string) error { - // if err := parseForm(r); err != nil { - // return err - // } + if err := parseForm(r); err != nil { + return err + } + registry := r.Form.Get("registry") - // registry := r.Form.Get("registry") + if vars == nil { + return fmt.Errorf("Missing parameter") + } + name := vars["name"] - // if vars == nil { - // return fmt.Errorf("Missing parameter") - // } - // name := vars["name"] - - // in, out, err := hijackServer(w) - // if err != nil { - // return err - // } - // defer in.Close() - // fmt.Fprintf(out, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n") - // if err := srv.ImagePush(name, registry, out); err != nil { - // fmt.Fprintf(out, "Error: %s\n", err) - // } + in, out, err := hijackServer(w) + if err != nil { + return err + } + defer in.Close() + fmt.Fprintf(out, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n") + if err := srv.ImagePush(name, registry, out); err != nil { + fmt.Fprintf(out, "Error: %s\n", err) + } return nil }