Skip to content

chore: cherry pick fixes for v0.12.0 rc3 #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2025
Merged

chore: cherry pick fixes for v0.12.0 rc3 #1360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions pkg/patch/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ import (
sourcepolicy "github.com/moby/buildkit/sourcepolicy/pb"
)

const (
attrValueTrue = "true"
)

// BuildConfig holds configuration for building and exporting images.
type BuildConfig struct {
SolveOpt client.SolveOpt
Expand Down Expand Up @@ -45,18 +49,23 @@ func createBuildConfig(
"annotation." + copaAnnotationKeyPrefix + ".image.patched": time.Now().UTC().Format(time.RFC3339),
}
if shouldExportOCI {
attrs["oci-mediatypes"] = "true"
attrs["oci-mediatypes"] = attrValueTrue
}

if push {
attrs["push"] = "true"
attrs["push"] = attrValueTrue
solveOpt.Exports = []client.ExportEntry{
{
Type: client.ExporterImage,
Attrs: attrs,
},
}
} else {
// Use uncompressed layers for local export to ensure diff_id == blob digest
// This fixes Trivy scanning issues where compressed layers have mismatched hashes
attrs["compression"] = "uncompressed"
attrs["force-compression"] = attrValueTrue

solveOpt.Exports = []client.ExportEntry{
{
Type: client.ExporterDocker,
Expand Down
Loading