Skip to content

Conversation

@jameslamb
Copy link
Member

Forward merges changes from #830 to main.

Created like this:

git fetch upstream release/25.12
git checkout main
git fetch upstream main
git checkout -b oci-types
git cherry-pick b863fa000b5cd52246b47d09125e2f7ca1be4379

Notes for Reviewers

Labeled breaking because this changes the media types of some image layers, which may cause issues for some docker versions (but hopefully not, because this switches to OCI-compliant types which should be MORE portable).

THIS SHOULD BE /merge nosquash merged

Contributes to #831 

2025.12 images from here appear to contain some non-OCI mediatypes,
which is causing tools that expect OCI-compliant images to fail when
processing them, which is blocking the release to NVCR.

This does the following:

* forces BuildKit to only use OCI mediatypes
* pins BuildKit to a specific version, to remove one source of change
from build to build
@jameslamb jameslamb requested a review from AyodeAwe December 17, 2025 23:19
@jameslamb jameslamb requested a review from a team as a code owner December 17, 2025 23:19
@jameslamb jameslamb added bug Something isn't working breaking Breaking change labels Dec 17, 2025
@bdice
Copy link
Contributor

bdice commented Dec 17, 2025

The /merge nosquash command only works if the branch name follows a specific pattern. Someone with admin power will have to do this no-squash merge manually. Otherwise LGTM.

@gforsyth gforsyth merged commit 74a51c5 into main Dec 18, 2025
66 checks passed
@gforsyth gforsyth deleted the oci-types branch December 18, 2025 14:47
@jameslamb
Copy link
Member Author

Ah got it, I forgot about the branch name conventions for /merge nosquash.

Thanks for merging this @gforsyth

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

breaking Breaking change bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants