beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #31056 from tonistiigi/build-cache-fix

Browse source 
Reset stdin config before running build actions
This commit is contained in:
Brian Goff 2017-02-15 18:02:57 -05:00 committed by GitHub
commit d26cf30a60
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builder/dockerfile/internals.go
View file

@ -419,6 +419,10 @@ func (b *Builder) processImageFrom(img builder.Image) error {
onBuildTriggers := b.runConfig.OnBuild onBuildTriggers := b.runConfig.OnBuild
b.runConfig.OnBuild = []string{} b.runConfig.OnBuild = []string{}
// Reset stdin settings as all build actions run without stdin
b.runConfig.OpenStdin = false
b.runConfig.StdinOnce = false
// parse the ONBUILD triggers by invoking the parser // parse the ONBUILD triggers by invoking the parser
for _, step := range onBuildTriggers { for _, step := range onBuildTriggers {
ast, err := parser.Parse(strings.NewReader(step), &b.directive) ast, err := parser.Parse(strings.NewReader(step), &b.directive)