浏览代码

Merge pull request #31850 from yummypeng/ignore-layer-does-not-exist

Ignore `layer does not exist` error from `docker images`
Vincent Demeester 8 年之前
父节点
当前提交
11eb4fe70c
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      daemon/images.go

+ 5 - 0
daemon/images.go

@@ -118,6 +118,11 @@ func (daemon *Daemon) Images(imageFilters filters.Args, all bool, withExtraAttrs
 		if layerID != "" {
 		if layerID != "" {
 			l, err := daemon.layerStore.Get(layerID)
 			l, err := daemon.layerStore.Get(layerID)
 			if err != nil {
 			if err != nil {
+				// The layer may have been deleted between the call to `Map()` or
+				// `Heads()` and the call to `Get()`, so we just ignore this error
+				if err == layer.ErrLayerDoesNotExist {
+					continue
+				}
 				return nil, err
 				return nil, err
 			}
 			}