Merge pull request #9617 from vrothberg/fix-9588

image removal: ignore unknown-layer errors
containers · Mar 4, 2021 · e4cf1d4 · e4cf1d4
2 parents 87a78c0 + e43385e
commit e4cf1d4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
@@ -583,8 +583,9 @@ func (ir *ImageEngine) Remove(ctx context.Context, images []string, opts entitie
 			report.Deleted = append(report.Deleted, results.Deleted)
 			report.Untagged = append(report.Untagged, results.Untagged...)
 			return nil
-		case storage.ErrImageUnknown:
-			// The image must have been removed already (see #6510).
+		case storage.ErrImageUnknown, storage.ErrLayerUnknown:
+			// The image must have been removed already (see #6510)
+			// or the storage is corrupted (see #9617).
 			report.Deleted = append(report.Deleted, img.ID())
 			report.Untagged = append(report.Untagged, img.ID())
 			return nil