Merge branch 'main' into billy/feat/req-ipc-allow-builder-ip

Author: billyb2

pkg/buildx/bake/bake.go

@@ -1286,6 +1286,8 @@ func setPushOverride(outputs []*buildflags.ExportEntry, push bool) []*buildflags
 				outputs[i] = output
 			}
 		}
+
+		return outputs
 	}
 
 	for i, output := range outputs {

pkg/load/cli.go

@@ -6,6 +6,7 @@ import (
 
 	depotbuild "github.com/depot/cli/pkg/build"
 	"github.com/docker/buildx/build"
+	"github.com/docker/buildx/util/platformutil"
 	"github.com/docker/buildx/util/progress"
 	"github.com/moby/buildkit/client"
 )
@@ -79,6 +80,13 @@ func WithDepotImagePull(buildOpts map[string]build.Options, loadOpts DepotLoadOp
 				pullOpt.Username = &loadOpts.PullInfo.Username
 				pullOpt.Password = &loadOpts.PullInfo.Password
 				pullOpt.ServerAddress = &serverAddress
+
+				platforms := platformutil.Format(buildOpt.Platforms)
+				// only specify a platform to pull when a single platform is used
+				if len(platforms) == 1 {
+					platform := platforms[0]
+					pullOpt.Platform = &platform
+				}
 			}
 
 			toPull[target] = pullOpt

pkg/registry/cli.go

@@ -35,20 +35,24 @@ func WithDepotSave(buildOpts map[string]buildx.Options, opts SaveOptions) map[st
 			}
 		}
 
+		exports := deepCloneExports(buildOpt.Exports)
+
 		for _, i := range imageExportIndices {
-			_, ok := buildOpt.Exports[i].Attrs["push"]
+			_, ok := exports[i].Attrs["push"]
 			hadPush = hadPush || ok
-			buildOpt.Exports[i].Attrs["push"] = "true"
+			exports[i].Attrs["push"] = "true"
 		}
 
 		if len(imageExportIndices) == 0 {
 			exportImage := client.ExportEntry{
 				Type:  "image",
 				Attrs: map[string]string{"push": "true"},
 			}
-			buildOpt.Exports = append(buildOpt.Exports, exportImage)
+			exports = append(exports, exportImage)
 		}
 
+		buildOpt.Exports = exports
+
 		additionalTags := slices.Clone(opts.AdditionalTags)
 		for i, tag := range additionalTags {
 			if opts.AddTargetSuffix {
@@ -68,3 +72,23 @@ func WithDepotSave(buildOpts map[string]buildx.Options, opts SaveOptions) map[st
 
 	return buildOpts
 }
+
+func deepCloneExports(original []client.ExportEntry) []client.ExportEntry {
+	if original == nil {
+		return nil
+	}
+
+	exports := make([]client.ExportEntry, len(original))
+	for i := range original {
+		clone := original[i]
+		// Attrs is the only field with references
+		clone.Attrs = make(map[string]string, len(original[i].Attrs))
+		for k, v := range original[i].Attrs {
+			clone.Attrs[k] = v
+		}
+
+		exports[i] = clone
+	}
+
+	return exports
+}