Merge pull request #2650 from crazy-max/fix-subrequest-metadatafile

build: skip build ref and provenance metadata for subrequests
docker · Aug 13, 2024 · 1c66f29 · 1c66f29
2 parents 07a85a5 + 36cd88f
commit 1c66f29
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/build/build.go b/build/build.go
@@ -510,10 +510,12 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 					for k, v := range printRes {
 						rr.ExporterResponse[k] = string(v)
 					}
-					rr.ExporterResponse["buildx.build.ref"] = buildRef
-					if node.Driver.HistoryAPISupported(ctx) {
-						if err := setRecordProvenance(ctx, c, rr, so.Ref, opt.ProvenanceResponseMode, pw); err != nil {
-							return err
+					if opt.PrintFunc == nil {
+						rr.ExporterResponse["buildx.build.ref"] = buildRef
+						if node.Driver.HistoryAPISupported(ctx) {
+							if err := setRecordProvenance(ctx, c, rr, so.Ref, opt.ProvenanceResponseMode, pw); err != nil {
+								return err
+							}
 						}
 					}
 

diff --git a/tests/bake.go b/tests/bake.go
@@ -1271,6 +1271,6 @@ target "default" {}
 	}
 	var md mdT
 	require.NoError(t, json.Unmarshal(dt, &md), dt)
-	require.NotEmpty(t, md.Default.BuildRef)
+	require.Empty(t, md.Default.BuildRef)
 	require.Len(t, md.Default.ResultJSON.Warnings, 3)
 }
diff --git a/tests/build.go b/tests/build.go
@@ -1228,7 +1228,7 @@ COPy --from=base \
 		}
 		var md mdT
 		require.NoError(t, json.Unmarshal(dt, &md), dt)
-		require.NotEmpty(t, md.BuildRef)
+		require.Empty(t, md.BuildRef)
 		require.Len(t, md.ResultJSON.Warnings, 3)
 	})
 }