opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8172 from rhatdan/storage

Browse Source 
[NO TESTS NEEDED] allow the removal of storage images
This commit is contained in:
OpenShift Merge Robot
2021-03-08 23:32:34 +01:00
committed by GitHub
parent ff46d13ea6 e9db604922
commit 021ff992ff
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/runtime_img.go
View File

@ -325,6 +325,15 @@ func (r *Runtime) LoadImageFromSingleImageArchive(ctx context.Context, writer io
return "", errors.Wrapf(saveErr, "error pulling image") return "", errors.Wrapf(saveErr, "error pulling image")
} }
// RemoveImageFromStorage goes directly to storage and attempts to remove
// the specified image. This is dangerous and should only be done if libpod
// reports that image is not known. This call is useful if you have a corrupted
// image that was never fully added to the libpod database.
func (r *Runtime) RemoveImageFromStorage(id string) error {
_, err := r.store.DeleteImage(id, true)
return err
}
func getImageNames(images []*image.Image) string { func getImageNames(images []*image.Image) string {
var names string var names string
for i := range images { for i := range images {

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

@ -640,6 +640,10 @@ func (ir *ImageEngine) Remove(ctx context.Context, images []string, opts entitie
for _, id := range images { for _, id := range images {
img, err := ir.Libpod.ImageRuntime().NewFromLocal(id) img, err := ir.Libpod.ImageRuntime().NewFromLocal(id)
if err != nil { if err != nil {
// attempt to remove image from storage
if forceErr := ir.Libpod.RemoveImageFromStorage(id); forceErr == nil {
continue
}
rmErrors = append(rmErrors, err) rmErrors = append(rmErrors, err)
continue continue
} }