Skip to content

containerd: ensure overwritten images from load are left dangling#49650

Merged
vvoland merged 1 commit intomoby:masterfrom
jsternberg:containerd-dangling-image-on-load
Apr 4, 2025
Merged

containerd: ensure overwritten images from load are left dangling#49650
vvoland merged 1 commit intomoby:masterfrom
jsternberg:containerd-dangling-image-on-load

Conversation

@jsternberg
Copy link
Collaborator

@jsternberg jsternberg commented Mar 17, 2025

During a load, ensure any existing images are left as dangling images.
This affects the docker load command with the containerd snapshotter
backend.

Fixes the load portion of #48907.

Fix `docker load` not preserving replaced images

Copy link
Contributor

@vvoland vvoland left a comment

Choose a reason for hiding this comment

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

Thanks, that's clever solution!

Could we also have some test for this?

@vvoland vvoland added area/images Image Distribution kind/bugfix PR's that fix bugs containerd-integration Issues and PRs related to containerd integration status/2-code-review labels Mar 18, 2025
@vvoland vvoland added this to the 28.0.3 milestone Mar 18, 2025
@jsternberg jsternberg force-pushed the containerd-dangling-image-on-load branch from 1360f0f to 00718a9 Compare March 19, 2025 17:02
@jsternberg
Copy link
Collaborator Author

Integrated the feedback and added an integration test.

@jsternberg jsternberg force-pushed the containerd-dangling-image-on-load branch from 00718a9 to f6fd153 Compare March 19, 2025 17:13
@jsternberg
Copy link
Collaborator Author

I've created #49669 as an alternative to this. That method would involve just allowing containerd to tag them as dangling images on load as discussed in this issue: #48907.

@vvoland vvoland modified the milestones: 28.0.3, 28.0.4 Mar 25, 2025
@jsternberg jsternberg force-pushed the containerd-dangling-image-on-load branch from f6fd153 to c2af120 Compare March 25, 2025 14:04
@vvoland vvoland modified the milestones: 28.0.4, 28.0.5 Mar 25, 2025
During a load, ensure any existing images are left as dangling images.
This affects the `docker load` command with the containerd snapshotter
backend.

Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
@jsternberg jsternberg force-pushed the containerd-dangling-image-on-load branch from c2af120 to 8f506a5 Compare March 26, 2025 14:23
@thompson-shaun thompson-shaun modified the milestones: 28.0.5, 28.1.0 Apr 3, 2025
@thompson-shaun thompson-shaun requested a review from dmcgowan April 3, 2025 14:40
@vvoland vvoland merged commit 68451d3 into moby:master Apr 4, 2025
162 checks passed
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 impact/changelog kind/bugfix PR's that fix bugs status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants