Fix containerimage multi-platform unpack #3982
Merged
Conversation
This file contains 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
The original commit (fddd129) that added this test did so to check that empty layers wouldn't be unpacked which would cause a nil de-reference. However, `unpack` wasn't added to the export test, so the test wasn't actually testing the changed behavior. Signed-off-by: Justin Chadwell <me@jedevc.com>
fddd129 added an overly broad check for preventing unpacking scratch objects, which also prevents unpacking any multi-platform images (which instead use `src.Refs`). We can push the nil check down into unpackImage, and also use the `FindRef` result helper to simplify to the Ref(s). Signed-off-by: Justin Chadwell <me@jedevc.com>
tonistiigi
approved these changes
Jul 6, 2023
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.
🛠️ Fix docker/buildx#1813 (comment) (see point 2 in #3891 (comment))
⬆️ Fixes up #3251
cc @vvoland @rumpl
In #3251, we added an overly restrictive check for
unpackImagewhich, while preventing it from unpacking images with no layers, also prevented it from unpacking multi-platform images.This PR pushes the check further down into
unpackImage, so that we can still unpack multi-platform images.(Maybe also worth a cherry-pick back to the v0.11 branch?)