Merge pull request docker#2754 from crazy-max/call-localstate

build: don't generate local state for subrequests
aepifanov · Oct 25, 2024 · 2bdf451 · 2bdf451
2 parents 658ed58 + 886ae21
commit 2bdf451
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/build/localstate.go b/build/localstate.go
@@ -11,7 +11,7 @@ import (
 
 func saveLocalState(so *client.SolveOpt, target string, opts Options, node builder.Node, cfg *confutil.Config) error {
 	var err error
-	if so.Ref == "" {
+	if so.Ref == "" || opts.CallFunc != nil {
 		return nil
 	}
 	lp := opts.Inputs.ContextPath

diff --git a/commands/bake.go b/commands/bake.go
@@ -464,12 +464,18 @@ func saveLocalStateGroup(dockerCli command.Cli, in bakeOptions, targets []string
 	groupRef := identity.NewID()
 	refs := make([]string, 0, len(bo))
 	for k, b := range bo {
+		if b.CallFunc != nil {
+			continue
+		}
 		b.Ref = identity.NewID()
 		b.GroupRef = groupRef
 		b.ProvenanceResponseMode = prm
 		refs = append(refs, b.Ref)
 		bo[k] = b
 	}
+	if len(refs) == 0 {
+		return nil
+	}
 	l, err := localstate.New(confutil.NewConfig(dockerCli))
 	if err != nil {
 		return err