opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 08:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7887 from vrothberg/fix-7872

Browse Source 
image prune: remove all candidates
This commit is contained in:
OpenShift Merge Robot
2020-10-02 11:31:43 -04:00
committed by GitHub
parent 4fb36a3133 6c151b98b6
commit b58980a43c
2 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
libpod/image/prune.go
View File

@ -125,29 +125,39 @@ func (ir *Runtime) PruneImages(ctx context.Context, all bool, filter []string) (
filterFuncs = append(filterFuncs, generatedFunc)
}
pruneImages, err := ir.GetPruneImages(ctx, all, filterFuncs)
if err != nil {
return nil, errors.Wrap(err, "unable to get images to prune")
}
prunedCids := make([]string, 0, len(pruneImages))
for _, p := range pruneImages {
repotags, err := p.RepoTags()
pruned := []string{}
prev := 0
for {
toPrune, err := ir.GetPruneImages(ctx, all, filterFuncs)
if err != nil {
return nil, err
return nil, errors.Wrap(err, "unable to get images to prune")
}
if err := p.Remove(ctx, true); err != nil {
if errors.Cause(err) == storage.ErrImageUsedByContainer {
logrus.Warnf("Failed to prune image %s as it is in use: %v.\nA container associated with containers/storage i.e. Buildah, CRI-O, etc., maybe associated with this image.\nUsing the rmi command with the --force option will remove the container and image, but may cause failures for other dependent systems.", p.ID(), err)
continue
numImages := len(toPrune)
if numImages == 0 || numImages == prev {
// If there's nothing left to do, return.
break
}
prev = numImages
for _, img := range toPrune {
repotags, err := img.RepoTags()
if err != nil {
return nil, err
}
return nil, errors.Wrap(err, "failed to prune image")
if err := img.Remove(ctx, false); err != nil {
if errors.Cause(err) == storage.ErrImageUsedByContainer {
logrus.Warnf("Failed to prune image %s as it is in use: %v.\nA container associated with containers/storage (e.g., Buildah, CRI-O, etc.) maybe associated with this image.\nUsing the rmi command with the --force option will remove the container and image, but may cause failures for other dependent systems.", img.ID(), err)
continue
}
return nil, errors.Wrap(err, "failed to prune image")
}
defer img.newImageEvent(events.Prune)
nameOrID := img.ID()
if len(repotags) > 0 {
nameOrID = repotags[0]
}
pruned = append(pruned, nameOrID)
}
defer p.newImageEvent(events.Prune)
nameOrID := p.ID()
if len(repotags) > 0 {
nameOrID = repotags[0]
}
prunedCids = append(prunedCids, nameOrID)
}
return prunedCids, nil
return pruned, nil
}

6
pkg/domain/infra/abi/images.go
View File

@ -46,11 +46,7 @@ func (ir *ImageEngine) Exists(_ context.Context, nameOrID string) (*entities.Boo
}
func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOptions) (*entities.ImagePruneReport, error) {
return ir.pruneImagesHelper(ctx, opts.All, opts.Filter)
}
func (ir *ImageEngine) pruneImagesHelper(ctx context.Context, all bool, filters []string) (*entities.ImagePruneReport, error) {
results, err := ir.Libpod.ImageRuntime().PruneImages(ctx, all, filters)
results, err := ir.Libpod.ImageRuntime().PruneImages(ctx, opts.All, opts.Filter)
if err != nil {
return nil, err
}