Merge pull request #28117 from ping035627/ping035627-patch-1107

Modify to improve code readability
This commit is contained in:
Sebastiaan van Stijn 2016-11-08 09:44:45 +01:00 committed by GitHub
commit f5283bd253
1 changed files with 4 additions and 8 deletions

View File

@ -136,13 +136,8 @@ func (out *lastProgressOutput) WriteProgress(prog progress.Progress) error {
func runBuild(dockerCli *command.DockerCli, options buildOptions) error { func runBuild(dockerCli *command.DockerCli, options buildOptions) error {
var ( var (
buildCtx io.ReadCloser buildCtx io.ReadCloser
err error err error
)
specifiedContext := options.context
var (
contextDir string contextDir string
tempDir string tempDir string
relDockerfile string relDockerfile string
@ -150,6 +145,7 @@ func runBuild(dockerCli *command.DockerCli, options buildOptions) error {
buildBuff io.Writer buildBuff io.Writer
) )
specifiedContext := options.context
progBuff = dockerCli.Out() progBuff = dockerCli.Out()
buildBuff = dockerCli.Out() buildBuff = dockerCli.Out()
if options.quiet { if options.quiet {