Skip to content

Fix: restrict EnsureContent to the requested platform#3920

Merged
AkihiroSuda merged 1 commit intocontainerd:mainfrom
apostasie:fix-3866
Feb 26, 2025
Merged

Fix: restrict EnsureContent to the requested platform#3920
AkihiroSuda merged 1 commit intocontainerd:mainfrom
apostasie:fix-3866

Conversation

@apostasie
Copy link
Copy Markdown
Contributor

@apostasie apostasie commented Feb 24, 2025

Hopefully fix #3866 (to be confirmed).

This is 5-minutes-slapstick patching, so, this one needs scrutiny.

@apostasie apostasie changed the title [WIP] Restrict ensurecontent to the requested platform Restrict ensurecontent to the requested platform Feb 24, 2025
@apostasie
Copy link
Copy Markdown
Contributor Author

CI failure is #3908

@apostasie apostasie changed the title Restrict ensurecontent to the requested platform Fix: restrict EnsureContent to the requested platform Feb 24, 2025
@apostasie apostasie marked this pull request as ready for review February 24, 2025 04:50
@yankay
Copy link
Copy Markdown
Contributor

yankay commented Feb 24, 2025

Thanks @apostasie
It works 👍
/lgtm

(base) root@kay201:~/oss/nerdctl# ./_output/nerdctl  -n k8s.io image save -o /tmp/registry.k8s.io_pause_3.10.tar m.daocloud.io/registry.k8s.io/pause:3.10
(base) root@kay201:~/oss/nerdctl# du -sh /tmp/registry.k8s.io_pause_3.10.tar
324K    /tmp/registry.k8s.io_pause_3.10.tar

@apostasie
Copy link
Copy Markdown
Contributor Author

Rebased.

Signed-off-by: apostasie <spam_blackhole@farcloser.world>
@AkihiroSuda AkihiroSuda added this to the v2.0.4 milestone Feb 26, 2025
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 3a99ed8 into containerd:main Feb 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

The nerdctl save command pulls the image when the image is already pulled by the ctr i pull.

3 participants