In case where build arg exists with nil value, count as unmatched arg

daghack · daghack · commit ae8f60b3fcd7 · 2024-06-17T05:27:25.000-07:00
Signed-off-by: Talon Bowler &lt;talon.bowler@docker.com&gt;
diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go
@@ -2210,7 +2210,9 @@ func reportUnmatchedVariables(cmd instructions.Command, buildArgs []instructions
 		return
 	}
 	for _, buildArg := range buildArgs {
-		delete(unmatched, buildArg.Key)
+		if buildArg.Value != nil {
+			delete(unmatched, buildArg.Key)
+		}
 	}
 	if len(unmatched) == 0 {
 		return

Original file line number	Diff line number	Diff line change
`@@ -2210,7 +2210,9 @@ func reportUnmatchedVariables(cmd instructions.Command, buildArgs []instructions`
`2210`	`2210`	`return`
`2211`	`2211`	`}`
`2212`	`2212`	`for _, buildArg := range buildArgs {`
`2213`		`- delete(unmatched, buildArg.Key)`
	`2213`	`+ if buildArg.Value != nil {`
	`2214`	`+ delete(unmatched, buildArg.Key)`
	`2215`	`+ }`
`2214`	`2216`	`}`
`2215`	`2217`	`if len(unmatched) == 0 {`
`2216`	`2218`	`return`