Merge pull request #6184 from crazy-max/v0.24_picks_0.24.0

crazy-max · web-flow · commit b772c3183680 · 2025-09-03T14:19:53.000+02:00
[v0.24] cherry-picks for v0.24.0
diff --git a/frontend/dockerfile/builder/caps.go b/frontend/dockerfile/builder/caps.go
@@ -10,9 +10,10 @@ import (
 )
 
 var enabledCaps = map[string]struct{}{
-	"moby.buildkit.frontend.inputs":      {},
-	"moby.buildkit.frontend.subrequests": {},
-	"moby.buildkit.frontend.contexts":    {},
+	"moby.buildkit.frontend.inputs":         {},
+	"moby.buildkit.frontend.subrequests":    {},
+	"moby.buildkit.frontend.contexts":       {},
+	"moby.buildkit.frontend.gitquerystring": {},
 }
 
 func validateCaps(req string) (forward bool, err error) {
diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile
@@ -33,7 +33,7 @@ RUN --mount=target=. --mount=type=cache,target=/root/.cache \
 
 FROM scratch AS release
 LABEL moby.buildkit.frontend.network.none="true"
-LABEL moby.buildkit.frontend.caps="moby.buildkit.frontend.inputs,moby.buildkit.frontend.subrequests,moby.buildkit.frontend.contexts"
+LABEL moby.buildkit.frontend.caps="moby.buildkit.frontend.inputs,moby.buildkit.frontend.subrequests,moby.buildkit.frontend.contexts,moby.buildkit.frontend.gitquerystring"
 COPY --from=build /dockerfile-frontend /bin/dockerfile-frontend
 ENTRYPOINT ["/bin/dockerfile-frontend"]
 

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,10 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`var enabledCaps = map[string]struct{}{`
`13`		`- "moby.buildkit.frontend.inputs": {},`
`14`		`- "moby.buildkit.frontend.subrequests": {},`
`15`		`- "moby.buildkit.frontend.contexts": {},`
	`13`	`+ "moby.buildkit.frontend.inputs": {},`
	`14`	`+ "moby.buildkit.frontend.subrequests": {},`
	`15`	`+ "moby.buildkit.frontend.contexts": {},`
	`16`	`+ "moby.buildkit.frontend.gitquerystring": {},`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`func validateCaps(req string) (forward bool, err error) {`