mz851: keep reproducible output a consistent dockerv2 manifest#858
Open
mzihlmann wants to merge 2 commits into
Open
mz851: keep reproducible output a consistent dockerv2 manifest#858mzihlmann wants to merge 2 commits into
mzihlmann wants to merge 2 commits into
Conversation
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #851
A reproducible build always canonicalizes the image to dockerv2, since mutate.Canonical rebuilds it on an empty docker base. With FF_KANIKO_REPRODUCIBLE_PRESERVE_BASE_LAYERS the ReplaceBase splice then put the pristine OCI base layers back on top of that docker manifest, so the result was a docker schema2 manifest carrying OCI layer descriptors. That hybrid is malformed and strict readers such as dockle reject it.
The preserved base layers are now relabeled to their dockerv2 media type as they are spliced, which is a descriptor-only change that keeps each layer blob and digest intact. A base layer that has no digest-preserving docker form (zstd) has its preservation skipped with a warning, falling back to the recompressed canonical layer. A new assertion at the push chokepoint fails the build if the output manifest ever mixes OCI and docker media types, and the mz851 reproducible integration test exercises an OCI base so this path is covered.