fix(mutate): don't skip dir replacements via whiteout in export#2191
Merged
jonjohnsonjr merged 1 commit intogoogle:mainfrom Jan 14, 2026
Merged
fix(mutate): don't skip dir replacements via whiteout in export#2191jonjohnsonjr merged 1 commit intogoogle:mainfrom
jonjohnsonjr merged 1 commit intogoogle:mainfrom
Conversation
Consider a container with the following layers: layer1: a/foo b/bar layer2: .wh.a layer3: a/baz When exporting those layers to a flattened filesystem, we cannot skip processing `a/` because it's been visited before when `a/` is a whiteout directive. Otherwise the filesystem will end up with `a/foo a/baz b/bar` when we expect only `a/baz b/bar`. Signed-off-by: Rafael Fonseca <r4f4rfs@gmail.com>
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
|
This PR fixes #2029. |
Codecov Report✅ All modified and coverable lines are covered by tests.
Additional details and impacted files@@ Coverage Diff @@
## main #2191 +/- ##
===========================================
- Coverage 71.67% 53.07% -18.61%
===========================================
Files 123 164 +41
Lines 9935 10940 +1005
===========================================
- Hits 7121 5806 -1315
- Misses 2115 4428 +2313
- Partials 699 706 +7 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
jonjohnsonjr
approved these changes
Jan 14, 2026
r4f4
added a commit
to r4f4/oc-mirror
that referenced
this pull request
Jan 16, 2026
Update the dependency so we get the fix for replaced directories in oci layers google/go-containerregistry#2191
6 tasks
r4f4
added a commit
to r4f4/oc-mirror
that referenced
this pull request
Jan 22, 2026
Update the dependency so we get the fix for replaced directories in oci layers google/go-containerregistry#2191
r4f4
added a commit
to r4f4/oc-mirror
that referenced
this pull request
Jan 23, 2026
Update the dependency so we get the fix for replaced directories in oci layers google/go-containerregistry#2191
r4f4
added a commit
to r4f4/oc-mirror
that referenced
this pull request
Jan 27, 2026
Update the dependency so we get the fix for replaced directories in oci layers google/go-containerregistry#2191
openshift-cherrypick-robot
pushed a commit
to openshift-cherrypick-robot/oc-mirror
that referenced
this pull request
Jan 28, 2026
Update the dependency so we get the fix for replaced directories in oci layers google/go-containerregistry#2191
r4f4
added a commit
to r4f4/oc-mirror
that referenced
this pull request
Feb 3, 2026
Update the dependency so we get the fix for replaced directories in oci layers google/go-containerregistry#2191
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
4 participants
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.
Consider a container with the following layers:
When exporting those layers to a flattened filesystem, we cannot skip processing
a/because it's been visited before whena/is a whiteout directive. Otherwise the filesystem will end up witha/foo a/baz b/barwhen we expect onlya/baz b/bar.