1
0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00

Merge pull request #17695 from runcom/restore-images-log

graph: do not error out if images can't be restored
Upstream-commit: 0cdc96cd8f04c3e34eae0712c81e4d4129ae8029
Component: engine
This commit is contained in:
David Calavera
2015-11-04 11:45:44 -08:00

View File

@@ -182,10 +182,7 @@ func (graph *Graph) restore() error {
if graph.driver.Exists(id) {
img, err := graph.loadImage(id)
if err != nil {
if err != io.EOF {
return fmt.Errorf("could not restore image %s: %v", id, err)
}
logrus.Warnf("could not restore image %s due to corrupted files", id)
logrus.Warnf("ignoring image %s, it could not be restored: %v", id, err)
continue
}
graph.imageMutex.Lock(img.Parent)