Merge pull request moby#5048 from daghack/initialze-buildargs-from-base

tonistiigi · web-flow · commit f1d1e99213b4 · 2024-06-17T17:40:38.000-07:00
Initialize build args from stage base
diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go
@@ -1034,6 +1034,7 @@ func (ds *dispatchState) init() {
 	// the paths we use back to the base image.
 	ds.paths = ds.base.paths
 	ds.workdirSet = ds.base.workdirSet
+	ds.buildArgs = append(ds.buildArgs, ds.base.buildArgs...)
 }
 
 type dispatchStates struct {

Original file line number	Diff line number	Diff line change
`@@ -1034,6 +1034,7 @@ func (ds *dispatchState) init() {`
`1034`	`1034`	`// the paths we use back to the base image.`
`1035`	`1035`	`ds.paths = ds.base.paths`
`1036`	`1036`	`ds.workdirSet = ds.base.workdirSet`
	`1037`	`+ ds.buildArgs = append(ds.buildArgs, ds.base.buildArgs...)`
`1037`	`1038`	`}`
`1038`	`1039`
`1039`	`1040`	`type dispatchStates struct {`