beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #30378 from mlaventure/fix-negative-size

Browse source 
Ensure proper value is used when computing reclaimable space
This commit is contained in:
Brian Goff 2017-01-24 09:24:53 -05:00 committed by GitHub
commit ee7682ebae
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cli/command/formatter/disk_usage.go
View file

@ -196,7 +196,10 @@ func (c *diskUsageImagesContext) Reclaimable() string {
c.AddHeader(reclaimableHeader) c.AddHeader(reclaimableHeader)
for _, i := range c.images { for _, i := range c.images {
if i.Containers != 0 { if i.Containers != 0 {
used += i.Size if i.VirtualSize == -1 || i.SharedSize == -1 {
continue
}
used += i.VirtualSize - i.SharedSize
} }
} }

2
daemon/images.go
View file

@ -205,7 +205,7 @@ func (daemon *Daemon) Images(imageFilters filters.Args, all bool, withExtraAttrs
} }
if withExtraAttrs { if withExtraAttrs {
// Get Shared and Unique sizes // Get Shared sizes
for img, newImage := range imagesMap { for img, newImage := range imagesMap {
rootFS := *img.RootFS rootFS := *img.RootFS
rootFS.DiffIDs = nil rootFS.DiffIDs = nil