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

DeleteImage(): always delete mapped top layers #1209

Merged
merged 1 commit into from Apr 14, 2022
Merged

DeleteImage(): always delete mapped top layers #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 4 additions & 6 deletions store.go
View file
Open in desktop
Expand Up @@ -2452,6 +2452,10 @@ func (s *store) DeleteImage(id string, commit bool) (layers []string, err error)
}
layer := image.TopLayer
layersToRemoveMap := make(map[string]struct{})
layersToRemove = append(layersToRemove, image.MappedTopLayers...)
for _, mappedTopLayer := range image.MappedTopLayers {
layersToRemoveMap[mappedTopLayer] = struct{}{}
}
for layer != "" {
if rcstore.Exists(layer) {
break
Expand Down Expand Up @@ -2483,12 +2487,6 @@ func (s *store) DeleteImage(id string, commit bool) (layers []string, err error)
if hasChildrenNotBeingRemoved() {
break
}
if layer == image.TopLayer {
layersToRemove = append(layersToRemove, image.MappedTopLayers...)
for _, mappedTopLayer := range image.MappedTopLayers {
layersToRemoveMap[mappedTopLayer] = struct{}{}
}
}
layersToRemove = append(layersToRemove, layer)
layersToRemoveMap[layer] = struct{}{}
layer = parent
Expand Down
18 changes: 17 additions & 1 deletion tests/idmaps.bats
View file
Open in desktop
Expand Up @@ -700,11 +700,27 @@ load helpers
test $actual = $expected
done

# Remove the containers and image and check that all of the layers we used got removed.
# Create a new layer based on the image.
run storage --debug=false create-layer --hostuidmap --hostgidmap $lowerlayer
echo "$output"
[ "$status" -eq 0 ]
[ "$output" != "" ]
upperlayer="$output"
run storage --debug=false applydiff -f "$TESTDIR"/layer.empty $upperlayer
# Create an image record for the new layer.
run storage --debug=false create-image $upperlayer
echo "$output"
[ "$status" -eq 0 ]
[ "$output" != "" ]
upperimage="$output"
echo upperimage:$upperimage

# Remove the containers and images and check that all of the layers we used got removed.
for container in "${containers[@]}" ; do
run storage --debug=false delete-container $container
done
run storage --debug=false delete-image $image
run storage --debug=false delete-image $upperimage
run storage --debug=false layers
echo "$output"
[ "$status" -eq 0 ]
Expand Down