Merge pull request moby#51493 from vvoland/c8d-build-noforceunpack

vvoland · web-flow · commit 70cd42fd30f5 · 2025-11-12T16:39:52.000+01:00
c8d/builder-next: Don't force unpack
diff --git a/daemon/internal/builder-next/exporter/wrapper.go b/daemon/internal/builder-next/exporter/wrapper.go
@@ -48,7 +48,10 @@ func (e *imageExporterMobyWrapper) Resolve(ctx context.Context, id int, exporter
 		return nil, err
 	}
 	exporterAttrs[string(exptypes.OptKeyName)] = strings.Join(reposAndTags, ",")
-	exporterAttrs[string(exptypes.OptKeyUnpack)] = "true"
+
+	if _, has := exporterAttrs[string(exptypes.OptKeyUnpack)]; !has {
+		exporterAttrs[string(exptypes.OptKeyUnpack)] = "true"
+	}
 	if _, has := exporterAttrs[string(exptypes.OptKeyDanglingPrefix)]; !has {
 		exporterAttrs[string(exptypes.OptKeyDanglingPrefix)] = "moby-dangling"
 	}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,10 @@ func (e *imageExporterMobyWrapper) Resolve(ctx context.Context, id int, exporter`
`48`	`48`	`return nil, err`
`49`	`49`	`}`
`50`	`50`	`exporterAttrs[string(exptypes.OptKeyName)] = strings.Join(reposAndTags, ",")`
`51`		`- exporterAttrs[string(exptypes.OptKeyUnpack)] = "true"`
	`51`	`+`
	`52`	`+ if _, has := exporterAttrs[string(exptypes.OptKeyUnpack)]; !has {`
	`53`	`+ exporterAttrs[string(exptypes.OptKeyUnpack)] = "true"`
	`54`	`+ }`
`52`	`55`	`if _, has := exporterAttrs[string(exptypes.OptKeyDanglingPrefix)]; !has {`
`53`	`56`	`exporterAttrs[string(exptypes.OptKeyDanglingPrefix)] = "moby-dangling"`
`54`	`57`	`}`