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

Merge pull request #152 from tonistiigi/stream-input 

build: use correct in-memory input
This commit is contained in:
Tibor Vass 2019-09-26 10:45:55 -07:00 committed by GitHub
parent 7c97854b6f 75f8d7ebb5
commit 1ec87b7beb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build.go
View File

@ -735,7 +735,7 @@ func LoadInputs(inp Inputs, target *client.SolveOpt) (func(), error) {
return nil, errStdinConflict
}
buf := bufio.NewReader(os.Stdin)
buf := bufio.NewReader(inp.InStream)
magic, err := buf.Peek(archiveHeaderSize * 2)
if err != nil && err != io.EOF {
return nil, errors.Wrap(err, "failed to peek context header from STDIN")
@ -761,7 +761,7 @@ func LoadInputs(inp Inputs, target *client.SolveOpt) (func(), error) {
target.LocalDirs["context"] = inp.ContextPath
switch inp.DockerfilePath {
case "-":
dockerfileReader = os.Stdin
dockerfileReader = inp.InStream
case "":
dockerfileDir = inp.ContextPath
default: