Skip to content

build: follow up fixes for build stream #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tonistiigi wants to merge 2 commits into from
Closed

build: follow up fixes for build stream #300

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d34f6c
build: follow up fixes for build stream
tonistiigi Jul 5, 2017
0747b8c
build: open dockerfile relative to context dir
tonistiigi Nov 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions cli/command/image/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"io"
"io/ioutil"
"os"
"path/filepath"
"regexp"
"runtime"

Expand Down Expand Up @@ -166,15 +167,16 @@ func (out *lastProgressOutput) WriteProgress(prog progress.Progress) error {
// nolint: gocyclo
func runBuild(dockerCli command.Cli, options buildOptions) error {
var (
buildCtx io.ReadCloser
dockerfileCtx io.ReadCloser
err error
contextDir string
tempDir string
relDockerfile string
progBuff io.Writer
buildBuff io.Writer
remote string
buildCtx io.ReadCloser
dockerfileCtx io.ReadCloser
err error
contextDir string
tempDir string
relDockerfile string
progBuff io.Writer
buildBuff io.Writer
remote string
quietOutputBuffer *bytes.Buffer
)

if options.dockerfileFromStdin() {
Expand All @@ -189,7 +191,8 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
buildBuff = dockerCli.Out()
if options.quiet {
progBuff = bytes.NewBuffer(nil)
buildBuff = bytes.NewBuffer(nil)
quietOutputBuffer = bytes.NewBuffer(nil)
buildBuff = quietOutputBuffer
}
if options.imageIDFile != "" {
// Avoid leaving a stale file if we eventually fail
Expand Down Expand Up @@ -262,7 +265,7 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
// if streaming and dockerfile was not from stdin then read from file
// to the same reader that is usually stdin
if options.stream && dockerfileCtx == nil {
dockerfileCtx, err = os.Open(relDockerfile)
dockerfileCtx, err = os.Open(filepath.Join(contextDir, relDockerfile))
if err != nil {
return errors.Wrapf(err, "failed to open %s", relDockerfile)
}
Expand All @@ -284,7 +287,8 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
buildCtx = replaceDockerfileTarWrapper(ctx, buildCtx, relDockerfile, translator, &resolvedTags)
} else if dockerfileCtx != nil {
// if there was not archive context still do the possible replacements in Dockerfile
newDockerfile, _, err := rewriteDockerfileFrom(ctx, dockerfileCtx, translator)
var newDockerfile []byte
newDockerfile, resolvedTags, err = rewriteDockerfileFrom(ctx, dockerfileCtx, translator)
if err != nil {
return err
}
Expand Down Expand Up @@ -415,7 +419,7 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
jerr.Code = 1
}
if options.quiet {
fmt.Fprintf(dockerCli.Err(), "%s%s", progBuff, buildBuff)
fmt.Fprintf(dockerCli.Err(), "%s%s", progBuff, quietOutputBuffer)
}
return cli.StatusError{Status: jerr.Message, StatusCode: jerr.Code}
}
Expand All @@ -435,7 +439,7 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
// Everything worked so if -q was provided the output from the daemon
// should be just the image ID and we'll print that to stdout.
if options.quiet {
imageID = fmt.Sprintf("%s", buildBuff)
imageID = quietOutputBuffer.String()
fmt.Fprintf(dockerCli.Out(), imageID)
}

Expand Down