correct algorithm for deleting all images

when deleting all images, we need to iterate all the images deleting on those who dont
have children first. And then reiterate until they are all gone.

This resolves #1926

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2018-12-04 10:14:13 -06:00
parent 5f6ad82524
commit 41a7bd9c9e

View File

@ -91,9 +91,24 @@ func rmiCmd(c *cli.Context) error {
if err != nil { if err != nil {
return errors.Wrapf(err, "unable to query local images") return errors.Wrapf(err, "unable to query local images")
} }
lastNumberofImages := 0
for len(imagesToDelete) > 0 {
if lastNumberofImages == len(imagesToDelete) {
return errors.New("unable to delete all images; re-run the rmi command again.")
}
for _, i := range imagesToDelete { for _, i := range imagesToDelete {
isParent, err := i.IsParent()
if err != nil {
return err
}
if isParent {
continue
}
removeImage(i) removeImage(i)
} }
lastNumberofImages = len(imagesToDelete)
imagesToDelete, err = runtime.ImageRuntime().GetImages()
}
} else { } else {
// Create image.image objects for deletion from user input. // Create image.image objects for deletion from user input.
// Note that we have to query the storage one-by-one to // Note that we have to query the storage one-by-one to