containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9617 from vrothberg/fix-9588 

image removal: ignore unknown-layer errors
This commit is contained in:
OpenShift Merge Robot 2021-03-04 10:16:23 -05:00 committed by GitHub
parent 87a78c059d e43385eca2
commit e4cf1d40d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,8 +583,9 @@ func (ir *ImageEngine) Remove(ctx context.Context, images []string, opts entitie
report.Deleted = append(report.Deleted, results.Deleted) report.Deleted = append(report.Deleted, results.Deleted)
report.Untagged = append(report.Untagged, results.Untagged...) report.Untagged = append(report.Untagged, results.Untagged...)
return nil return nil
case storage.ErrImageUnknown: case storage.ErrImageUnknown, storage.ErrLayerUnknown:
// The image must have been removed already (see #6510). // The image must have been removed already (see #6510)
// or the storage is corrupted (see #9617).
report.Deleted = append(report.Deleted, img.ID()) report.Deleted = append(report.Deleted, img.ID())
report.Untagged = append(report.Untagged, img.ID()) report.Untagged = append(report.Untagged, img.ID())
return nil return nil