Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[24.0 backport] c8d/prune: Fix images being deleted when they're still used with a different reference #45857

Merged
merged 7 commits into from
Jun 30, 2023
Merged

[24.0 backport] c8d/prune: Fix images being deleted when they're still used with a different reference #45857

merged 7 commits into from
Jun 30, 2023

Conversation

neersighted
Copy link
Member

@neersighted neersighted commented Jun 30, 2023 •
edited
Loading

Warning
Slight conflicts due to a lack of:

- What I did
Fixed image prune -a deleting dangling images used by containers.

- How I did it

  • Exclude dangling tag of the images used by containers (this makes sure that if the original image was deleted we don't delete the dangling image)
  • Exclude images that are used by containers which were started by specifying an image ID instead of a specific name.

- How to verify it

$ make TEST_INTEGRATION_USE_SNAPSHOTTER=1 \
       DOCKER_GRAPHDRIVER=overlayfs \
       TEST_FILTER=TestPruneDontDeleteUsedDangling \
       test-integration
...
INFO: Testing against a local daemon
=== RUN   TestPruneDontDeleteUsedDangling
--- PASS: TestPruneDontDeleteUsedDangling (0.07s)
PASS

DONE 1 tests in 1.079s

- Description for the changelog

containerd integration: `docker image prune -a` no longer removes images still in use by running containers

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

thaJeztah and others added 7 commits June 30, 2023 10:31
@thaJeztah @neersighted
c8d: ImageService.softImageDelete: use OCI and containerd constants
42f3f7e 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit df5deab)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
@thaJeztah @neersighted
c8d: ImageService.softImageDelete: rename var that collided with import
e0091d6 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f17c9e4)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
@vvoland @neersighted
testutil/environment: Add GetTestDanglingImageId
e2bade4 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
(cherry picked from commit a96e604)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
@vvoland @neersighted
c8d/softDelete: Extract ensureDanglingImage
8afe75f 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
(cherry picked from commit 2b0655a)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
@vvoland @neersighted
c8d/softDelete: Deep copy Labels
8bf037b 
So we don't override the original Labels in the passed image object.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
(cherry picked from commit a6d5db3)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
@vvoland @neersighted
c8d/prune: Exclude dangling tag of the images used by containers
87778af 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
(cherry picked from commit a93298d)
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
@vvoland @neersighted
c8d/prune: Handle containers started from image id
016ad9b 
If an image is only by id instead of its name, don't prune it
completely. but only untag it and create a dangling image for it.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
(cherry picked from commit e638351)
Resolved conflicts:
	daemon/containerd/image_prune.go
Signed-off-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
@neersighted neersighted added status/2-code-review area/images kind/bugfix PR's that fix bugs containerd-integration Issues and PRs related to containerd integration labels Jun 30, 2023
@neersighted neersighted added this to the 24.0.3 milestone Jun 30, 2023
@neersighted neersighted mentioned this pull request Jun 30, 2023
Merged
@neersighted neersighted mentioned this pull request Jun 30, 2023
Merged
thaJeztah
thaJeztah approved these changes Jun 30, 2023
View reviewed changes
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

@thaJeztah thaJeztah merged commit 3bd0f58 into moby:24.0 Jun 30, 2023
100 checks passed
@neersighted neersighted deleted the backport/45839/24.0 branch June 30, 2023 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@vvoland vvoland vvoland approved these changes

@laurazard laurazard Awaiting requested review from laurazard

Assignees
No one assigned
Labels
area/images containerd-integration Issues and PRs related to containerd integration kind/bugfix PR's that fix bugs status/4-merge
Projects
None yet
Milestone
24.0.3
Development

Successfully merging this pull request may close these issues.
3 participants
@neersighted @thaJeztah @vvoland