Fix containerimage multi-platform unpack #3982
Merged
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
unpackImage
which, 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?)