Skip to content

c8d/load: Multi-platform fixes#48293

Merged
vvoland merged 2 commits intomoby:masterfrom
vvoland:c8d-load-multiplatform-fixes
Aug 26, 2024
Merged

c8d/load: Multi-platform fixes#48293
vvoland merged 2 commits intomoby:masterfrom
vvoland:c8d-load-multiplatform-fixes

Conversation

@vvoland
Copy link
Contributor

@vvoland vvoland commented Aug 6, 2024

- What I did
Fixed some cases of docker load failing when loading a multi-platform image that contains platform incompatible with the host OS.

- How I did it
See commits.

- How to verify it

- Description for the changelog

- containerd image store: Fix early error exit from `docker load` in cases where unpacking the image would fail

- A picture of a cute animal (not mandatory but encouraged)

@vvoland vvoland added status/2-code-review kind/enhancement Enhancements are not bugs or new features but can improve usability or performance. process/cherry-pick area/images Image Distribution kind/bugfix PR's that fix bugs containerd-integration Issues and PRs related to containerd integration process/cherry-pick/27.1 labels Aug 6, 2024
@vvoland vvoland added this to the 28.0.0 milestone Aug 6, 2024
@vvoland vvoland self-assigned this Aug 6, 2024
@vvoland vvoland force-pushed the c8d-load-multiplatform-fixes branch from 272b6ce to efb975d Compare August 26, 2024 11:50
Log the error to the progress output instead.
The image is still loaded into the content store and image service even
if the unpacking failed, so don't error out the whole operation to avoid
missing the load events for other image names loaded from the same
archive.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
When loading a multi-platform image, it's not necessary to unpack all
platforms, especially those which have a completely different OS.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
@vvoland vvoland force-pushed the c8d-load-multiplatform-fixes branch from efb975d to 6ebe6a7 Compare August 26, 2024 13:15
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@laurazard laurazard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

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

Labels

area/images Image Distribution containerd-integration Issues and PRs related to containerd integration kind/bugfix PR's that fix bugs kind/enhancement Enhancements are not bugs or new features but can improve usability or performance. process/cherry-picked status/2-code-review

Projects

Development

Successfully merging this pull request may close these issues.

3 participants