docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update the UI for docker build

This commit is contained in:
Guillaume J. Charmes 2013-05-28 13:38:40 -07:00
parent 6ae3800151
commit 90ffcda055
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
commands.go
View File

@ -112,9 +112,8 @@ func (cli *DockerCli) CmdInsert(args ...string) error {
} }
func (cli *DockerCli) CmdBuild(args ...string) error { func (cli *DockerCli) CmdBuild(args ...string) error {
cmd := Subcmd("build", "[OPTIONS]", "Build an image from a Dockerfile") cmd := Subcmd("build", "[OPTIONS] [CONTEXT]", "Build an image from a Dockerfile")
fileName := cmd.String("f", "Dockerfile", "Use file as Dockerfile. Can be '-' for stdin") fileName := cmd.String("f", "Dockerfile", "Use `file` as Dockerfile. Can be '-' for stdin")
contextPath := cmd.String("c", "", "Use the specified directory as context for the build")
if err := cmd.Parse(args); err != nil { if err := cmd.Parse(args); err != nil {
return nil return nil
} }
@ -146,14 +145,16 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
} }
multipartBody = io.MultiReader(multipartBody, file) multipartBody = io.MultiReader(multipartBody, file)
compression := Bzip2
// Create a FormFile multipart for the context if needed // Create a FormFile multipart for the context if needed
if *contextPath != "" { if cmd.Arg(0) != "" {
// FIXME: Use NewTempArchive in order to have the size and avoid too much memory usage? // FIXME: Use NewTempArchive in order to have the size and avoid too much memory usage?
context, err := Tar(*contextPath, Bzip2) context, err := Tar(cmd.Arg(0), compression)
if err != nil { if err != nil {
return err return err
} }
if _, err := w.CreateFormFile("Context", *contextPath+".tar.bz2"); 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)"))
@ -165,6 +166,9 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
return err return err
} }
req.Header.Set("Content-Type", w.FormDataContentType()) req.Header.Set("Content-Type", w.FormDataContentType())
if cmd.Arg(0) != "" {
req.Header.Set("X-Docker-Context-Compression", compression.Flag())
}
resp, err := http.DefaultClient.Do(req) resp, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {