Preserve raw BUILDKIT_SYNTAX as cmdline option

marxarelli · marxarelli · commit fc3ecb60fbaf · 2025-08-26T13:56:07.000-07:00
Set gateway `source` to the first part of `BUILDKIT_SYNTAX` and
`cmdline` to the entire raw value to preserve additional options.

Signed-off-by: Dan Duvall &lt;dduvall@wikimedia.org&gt;
diff --git a/build/opt.go b/build/opt.go
@@ -117,8 +117,10 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt *O
 	}
 
 	if v, ok := opt.BuildArgs["BUILDKIT_SYNTAX"]; ok {
+		p := strings.SplitN(strings.TrimSpace(v), " ", 2)
 		so.Frontend = "gateway.v0"
-		so.FrontendAttrs["source"] = v
+		so.FrontendAttrs["source"] = p[0]
+		so.FrontendAttrs["cmdline"] = v
 	}
 
 	if v, ok := opt.BuildArgs["BUILDKIT_MULTI_PLATFORM"]; ok {

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,10 @@ func toSolveOpt(ctx context.Context, node builder.Node, multiDriver bool, opt *O`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`if v, ok := opt.BuildArgs["BUILDKIT_SYNTAX"]; ok {`
	`120`	`+ p := strings.SplitN(strings.TrimSpace(v), " ", 2)`
`120`	`121`	`so.Frontend = "gateway.v0"`
`121`		`- so.FrontendAttrs["source"] = v`
	`122`	`+ so.FrontendAttrs["source"] = p[0]`
	`123`	`+ so.FrontendAttrs["cmdline"] = v`
`122`	`124`	`}`
`123`	`125`
`124`	`126`	`if v, ok := opt.BuildArgs["BUILDKIT_MULTI_PLATFORM"]; ok {`