Browse Source

Merge pull request #37802 from Microsoft/jjh/37687-docker-system-df

Fix docker system df when LCOW and WCOW images loaded
Vincent Demeester 6 years ago
parent
commit
2bbd0bd8ef
1 changed files with 9 additions and 1 deletions
  1. 9 1
      daemon/images/images.go

+ 9 - 1
daemon/images/images.go

@@ -187,7 +187,15 @@ func (i *ImageService) Images(imageFilters filters.Args, all bool, withExtraAttr
 			// lazily init variables
 			// lazily init variables
 			if imagesMap == nil {
 			if imagesMap == nil {
 				allContainers = i.containers.List()
 				allContainers = i.containers.List()
-				allLayers = i.layerStores[img.OperatingSystem()].Map()
+
+				// allLayers is built from all layerstores combined
+				allLayers = make(map[layer.ChainID]layer.Layer)
+				for _, ls := range i.layerStores {
+					layers := ls.Map()
+					for k, v := range layers {
+						allLayers[k] = v
+					}
+				}
 				imagesMap = make(map[*image.Image]*types.ImageSummary)
 				imagesMap = make(map[*image.Image]*types.ImageSummary)
 				layerRefs = make(map[layer.ChainID]int)
 				layerRefs = make(map[layer.ChainID]int)
 			}
 			}