Merge pull request #3519 from vvoland/push-nounpack

build: Don't unpack by default when pushing

build/opt.go

@@ -831,6 +831,10 @@ func CreateExports(entries []*buildflags.ExportEntry) ([]client.ExportEntry, []s
 		case "registry":
 			out.Type = client.ExporterImage
 			out.Attrs["push"] = "true"
+			// Skip unpacking when only pushing to registry (unless explicitly set)
+			if _, ok := out.Attrs["unpack"]; !ok {
+				out.Attrs["unpack"] = "false"
+			}
 		}
 
 		if supportDir {

build/opt_test.go

@@ -81,3 +81,78 @@ func TestParseOCILayoutPath(t *testing.T) {
 		assert.Equal(t, tt.tag, tag, "comparing tag: %s", tt.s)
 	}
 }
+
+func TestCreateExports_RegistryUnpack(t *testing.T) {
+	tests := []struct {
+		name       string
+		entries    []*buildflags.ExportEntry
+		wantType   string
+		wantPush   string
+		wantUnpack string
+	}{
+		{
+			name: "registry type sets unpack=false",
+			entries: []*buildflags.ExportEntry{
+				{
+					Type:  "registry",
+					Attrs: map[string]string{},
+				},
+			},
+			wantType:   "image",
+			wantPush:   "true",
+			wantUnpack: "false",
+		},
+		{
+			name: "registry type respects explicit unpack=true",
+			entries: []*buildflags.ExportEntry{
+				{
+					Type: "registry",
+					Attrs: map[string]string{
+						"unpack": "true",
+					},
+				},
+			},
+			wantType:   "image",
+			wantPush:   "true",
+			wantUnpack: "true",
+		},
+		{
+			name: "registry type respects explicit unpack=false",
+			entries: []*buildflags.ExportEntry{
+				{
+					Type: "registry",
+					Attrs: map[string]string{
+						"unpack": "false",
+					},
+				},
+			},
+			wantType:   "image",
+			wantPush:   "true",
+			wantUnpack: "false",
+		},
+		{
+			name: "image type without push does not set unpack",
+			entries: []*buildflags.ExportEntry{
+				{
+					Type:  "image",
+					Attrs: map[string]string{},
+				},
+			},
+			wantType:   "image",
+			wantPush:   "",
+			wantUnpack: "",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			exports, _, err := CreateExports(tt.entries)
+			require.NoError(t, err)
+			require.Len(t, exports, 1)
+
+			require.Equal(t, tt.wantType, exports[0].Type)
+			require.Equal(t, tt.wantPush, exports[0].Attrs["push"])
+			require.Equal(t, tt.wantUnpack, exports[0].Attrs["unpack"])
+		})
+	}
+}

commands/build.go

@@ -542,7 +542,7 @@ func buildCmd(dockerCli command.Cli, rootOpts *rootOptions, debugger debuggerOpt
 
 	flags.StringArrayVar(&options.platforms, "platform", platformsDefault, "Set target platform for build")
 
-	flags.BoolVar(&options.exportPush, "push", false, `Shorthand for "--output=type=registry"`)
+	flags.BoolVar(&options.exportPush, "push", false, `Shorthand for "--output=type=registry,unpack=false"`)
 
 	flags.BoolVarP(&options.quiet, "quiet", "q", false, "Suppress the build output and print image ID on success")
 
@@ -1048,6 +1048,10 @@ func RunBuild(ctx context.Context, dockerCli command.Cli, in *BuildOptions, inSt
 		for i := range outputs {
 			if outputs[i].Type == client.ExporterImage {
 				outputs[i].Attrs["push"] = "true"
+				// Skip unpacking when only pushing to registry (unless explicitly set)
+				if _, ok := outputs[i].Attrs["unpack"]; !ok {
+					outputs[i].Attrs["unpack"] = "false"
+				}
 				pushUsed = true
 			}
 		}
@@ -1056,6 +1060,8 @@ func RunBuild(ctx context.Context, dockerCli command.Cli, in *BuildOptions, inSt
 				Type: client.ExporterImage,
 				Attrs: map[string]string{
 					"push": "true",
+					// Skip unpacking when only pushing to registry
+					"unpack": "false",
 				},
 			})
 		}

docs/reference/buildx_build.md

@@ -41,7 +41,7 @@ Start a build
 | [`--progress`](#progress)               | `string`      | `auto`    | Set type of progress output (`auto`, `none`,  `plain`, `quiet`, `rawjson`, `tty`). Use plain to show container output |
 | [`--provenance`](#provenance)           | `string`      |           | Shorthand for `--attest=type=provenance`                                                                              |
 | `--pull`                                | `bool`        |           | Always attempt to pull all referenced images                                                                          |
-| [`--push`](#push)                       | `bool`        |           | Shorthand for `--output=type=registry`                                                                                |
+| [`--push`](#push)                       | `bool`        |           | Shorthand for `--output=type=registry,unpack=false`                                                                   |
 | `-q`, `--quiet`                         | `bool`        |           | Suppress the build output and print image ID on success                                                               |
 | [`--sbom`](#sbom)                       | `string`      |           | Shorthand for `--attest=type=sbom`                                                                                    |
 | [`--secret`](#secret)                   | `stringArray` |           | Secret to expose to the build (format: `id=mysecret[,src=/local/secret]`)                                             |

docs/reference/buildx_dap_build.md

@@ -33,7 +33,7 @@ Start a build
 | `--progress`        | `string`      | `auto`    | Set type of progress output (`auto`, `none`,  `plain`, `quiet`, `rawjson`, `tty`). Use plain to show container output |
 | `--provenance`      | `string`      |           | Shorthand for `--attest=type=provenance`                                                                              |
 | `--pull`            | `bool`        |           | Always attempt to pull all referenced images                                                                          |
-| `--push`            | `bool`        |           | Shorthand for `--output=type=registry`                                                                                |
+| `--push`            | `bool`        |           | Shorthand for `--output=type=registry,unpack=false`                                                                   |
 | `-q`, `--quiet`     | `bool`        |           | Suppress the build output and print image ID on success                                                               |
 | `--sbom`            | `string`      |           | Shorthand for `--attest=type=sbom`                                                                                    |
 | `--secret`          | `stringArray` |           | Secret to expose to the build (format: `id=mysecret[,src=/local/secret]`)                                             |

docs/reference/buildx_debug_build.md

@@ -37,7 +37,7 @@ Start a build
 | `--progress`        | `string`      | `auto`    | Set type of progress output (`auto`, `none`,  `plain`, `quiet`, `rawjson`, `tty`). Use plain to show container output |
 | `--provenance`      | `string`      |           | Shorthand for `--attest=type=provenance`                                                                              |
 | `--pull`            | `bool`        |           | Always attempt to pull all referenced images                                                                          |
-| `--push`            | `bool`        |           | Shorthand for `--output=type=registry`                                                                                |
+| `--push`            | `bool`        |           | Shorthand for `--output=type=registry,unpack=false`                                                                   |
 | `-q`, `--quiet`     | `bool`        |           | Suppress the build output and print image ID on success                                                               |
 | `--sbom`            | `string`      |           | Shorthand for `--attest=type=sbom`                                                                                    |
 | `--secret`          | `stringArray` |           | Secret to expose to the build (format: `id=mysecret[,src=/local/secret]`)                                             |