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

Fix merge issue

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-05-28 13:46:52 -07:00
parent dce82bc856
commit a48799016a
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api.go
View file

@ -626,7 +626,7 @@ func postImagesGetCache(srv *Server, version float64, w http.ResponseWriter, r *
return nil return nil
} }
func postBuild(srv *Server, w http.ResponseWriter, r *http.Request, vars map[string]string) error { func postBuild(srv *Server, version float64, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
if err := r.ParseMultipartForm(4096); err != nil { if err := r.ParseMultipartForm(4096); err != nil {
return err return err
} }

2
buildfile.go
View file

@ -63,7 +63,7 @@ func (b *buildFile) CmdFrom(name string) error {
remote = name remote = name
} }
if err := b.srv.ImagePull(remote, tag, "", b.out); err != nil { if err := b.srv.ImagePull(remote, tag, "", b.out, false); err != nil {
return err return err
} }

2
commands.go
View file

@ -175,7 +175,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
if _, err := w.CreateFormFile("Context", cmd.Arg(0)+"."+compression.Extension()); err != nil { if _, err := w.CreateFormFile("Context", cmd.Arg(0)+"."+compression.Extension()); err != nil {
return err return err
} }
multipartBody = io.MultiReader(multipartBody, utils.ProgressReader(ioutil.NopCloser(context), -1, os.Stdout, "Uploading Context %v/%v (%v)")) multipartBody = io.MultiReader(multipartBody, utils.ProgressReader(ioutil.NopCloser(context), -1, os.Stdout, "Uploading Context %v/%v (%v)", false))
} }
// Send the multipart request with correct content-type // Send the multipart request with correct content-type

2
server.go
View file

@ -92,7 +92,7 @@ func (srv *Server) ImageInsert(name, url, path string, out io.Writer) (string, e
} }
if err := c.Inject(utils.ProgressReader(file.Body, int(file.ContentLength), out, "Downloading %v/%v (%v)\r", false), path); err != nil { if err := c.Inject(utils.ProgressReader(file.Body, int(file.ContentLength), out, "Downloading %v/%v (%v)\r", false), path); err != nil {
return err return "", err
} }
// FIXME: Handle custom repo, tag comment, author // FIXME: Handle custom repo, tag comment, author
img, err = b.Commit(c, "", "", img.Comment, img.Author, nil) img, err = b.Commit(c, "", "", img.Comment, img.Author, nil)