From 39948932b1937e83087380aea65e0e23913c40d2 Mon Sep 17 00:00:00 2001
From: John Howard <jhoward@microsoft.com>
Date: Tue, 13 Feb 2018 11:39:58 -0800
Subject: [PATCH] Don't restore image if layer does not exist

Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6903ca89af71d40aeaa0277dab13d3dc6dd801a7
Component: engine
---
 components/engine/image/store.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/engine/image/store.go b/components/engine/image/store.go
index c79fe39349..a8f8cee5b2 100644
--- a/components/engine/image/store.go
+++ b/components/engine/image/store.go
@@ -79,6 +79,10 @@ func (is *store) restore() error {
 			}
 			l, err = is.lss[img.OperatingSystem()].Get(chainID)
 			if err != nil {
+				if err == layer.ErrLayerDoesNotExist {
+					logrus.Errorf("layer does not exist, not restoring image %v, %v, %s", dgst, chainID, img.OperatingSystem())
+					return nil
+				}
 				return err
 			}
 		}