p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
revert "virtualSize" name change
Upstream-commit: f858d49483289e8f25378a66b9b72dc08d2d9974
Component: engine
This commit is contained in:
Kenfe-Mickaël Laventure
2017-01-13 08:54:27 -08:00
committed by GitHub
parent 8146a5de0f 9875c5c0d3
commit 68df9002fb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/daemon/images.go
View File

@ -315,13 +315,13 @@ func (daemon *Daemon) SquashImage(id, parent string) (string, error) {
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.ParentID = image.Parent.String()
newImage.ID = image.ID().String()
newImage.Created = image.Created.Unix()
newImage.Size = virtualSize
newImage.VirtualSize = virtualSize
newImage.Size = size
newImage.VirtualSize = size
newImage.SharedSize = -1
newImage.Containers = -1
if image.Config != nil {