kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #30120 from thaJeztah/revert-argument-name-change

Browse source 
revert "virtualSize" name change
This commit is contained in:
Kenfe-Mickaël Laventure 2017-01-13 08:54:27 -08:00 committed by GitHub
commit f858d49483
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/images.go
View file

@ -315,13 +315,13 @@ func (daemon *Daemon) SquashImage(id, parent string) (string, error) {
return string(newImgID), nil return string(newImgID), nil
} }
func newImage(image *image.Image, virtualSize int64) *types.ImageSummary { func newImage(image *image.Image, size int64) *types.ImageSummary {
newImage := new(types.ImageSummary) newImage := new(types.ImageSummary)
newImage.ParentID = image.Parent.String() newImage.ParentID = image.Parent.String()
newImage.ID = image.ID().String() newImage.ID = image.ID().String()
newImage.Created = image.Created.Unix() newImage.Created = image.Created.Unix()
newImage.Size = virtualSize newImage.Size = size
newImage.VirtualSize = virtualSize newImage.VirtualSize = size
newImage.SharedSize = -1 newImage.SharedSize = -1
newImage.Containers = -1 newImage.Containers = -1
if image.Config != nil { if image.Config != nil {