Skip to content

Commit 948aa8f

Browse files
committed
VirtualSize in list image Docker API is depricated
Signed-off-by: Kyle Quest <kcq.public@gmail.com>
1 parent 1644742 commit 948aa8f

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

pkg/app/master/command/build/handler.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,7 +1615,10 @@ func finishCommand(
16151615
errutil.WarnOn(err)
16161616

16171617
if err == nil {
1618-
cmdReport.MinifiedBy = float64(imageInspector.ImageInfo.VirtualSize) / float64(newImageInspector.ImageInfo.VirtualSize)
1618+
if newImageInspector.ImageInfo.Size > 0 {
1619+
cmdReport.MinifiedBy = float64(imageInspector.ImageInfo.Size) / float64(newImageInspector.ImageInfo.Size)
1620+
}
1621+
16191622
imgIdentity := crt.ImageToIdentity(imageInspector.ImageInfo)
16201623
cmdReport.SourceImage = report.ImageMetadata{
16211624
Identity: report.ImageIdentity{
@@ -1625,8 +1628,8 @@ func finishCommand(
16251628
Digests: imgIdentity.ShortDigests,
16261629
FullDigests: imgIdentity.RepoDigests,
16271630
},
1628-
Size: imageInspector.ImageInfo.VirtualSize,
1629-
SizeHuman: humanize.Bytes(uint64(imageInspector.ImageInfo.VirtualSize)),
1631+
Size: imageInspector.ImageInfo.Size,
1632+
SizeHuman: humanize.Bytes(uint64(imageInspector.ImageInfo.Size)),
16301633
CreateTime: imageInspector.ImageInfo.Created.UTC().Format(time.RFC3339),
16311634
Author: imageInspector.ImageInfo.Author,
16321635
RuntimeName: imageInspector.ImageInfo.RuntimeName,
@@ -1652,8 +1655,8 @@ func finishCommand(
16521655
cmdReport.SourceImage.Labels = imageInspector.ImageInfo.Config.Labels
16531656
cmdReport.SourceImage.EnvVars = imageInspector.ImageInfo.Config.Env
16541657

1655-
cmdReport.MinifiedImageSize = newImageInspector.ImageInfo.VirtualSize
1656-
cmdReport.MinifiedImageSizeHuman = humanize.Bytes(uint64(newImageInspector.ImageInfo.VirtualSize))
1658+
cmdReport.MinifiedImageSize = newImageInspector.ImageInfo.Size
1659+
cmdReport.MinifiedImageSizeHuman = humanize.Bytes(uint64(newImageInspector.ImageInfo.Size))
16571660

16581661
xc.Out.Info("results",
16591662
ovars{

pkg/app/master/command/build/image.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ func inspectFatImage(
114114
xc.Out.Info("image",
115115
ovars{
116116
"id": imageInspector.ImageInfo.ID,
117-
"size.bytes": imageInspector.ImageInfo.VirtualSize,
118-
"size.human": humanize.Bytes(uint64(imageInspector.ImageInfo.VirtualSize)),
117+
"size.bytes": imageInspector.ImageInfo.Size,
118+
"size.human": humanize.Bytes(uint64(imageInspector.ImageInfo.Size)),
119119
})
120120

121121
if imageInspector.ImageInfo.Config != nil &&

pkg/crt/clients.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ type ImageIdentity struct {
2424
}
2525

2626
type BasicImageInfo struct {
27-
ID string
28-
Size int64
29-
Created int64
30-
VirtualSize int64
27+
ID string
28+
Size int64
29+
Created int64
30+
//VirtualSize int64 <- Docker depricated its VirtualSize field in v1.44
3131
//empty for filtered calls
3232
ParentID string
3333
RepoTags []string

pkg/crt/docker/dockercrtclient/dockercrtclient.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ func (ref *Instance) ListImagesAll() ([]crt.BasicImageInfo, error) {
150150
ID: r.ID,
151151
Size: r.Size,
152152
Created: r.Created,
153-
VirtualSize: r.VirtualSize,
154153
ParentID: r.ParentID,
155154
RepoTags: r.RepoTags,
156155
RepoDigests: r.RepoDigests,

pkg/crt/podman/podmancrtclient/podmancrtclient.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,8 @@ func (ref *Instance) ListImagesAll() ([]crt.BasicImageInfo, error) {
212212
for _, r := range pimages {
213213
imageList = append(imageList, crt.BasicImageInfo{
214214
ID: r.ID,
215-
Size: r.Size,
215+
Size: r.Size, //r.VirtualSize
216216
Created: r.Created,
217-
VirtualSize: r.VirtualSize,
218217
ParentID: r.ParentId,
219218
RepoTags: r.RepoTags,
220219
RepoDigests: r.RepoDigests,

0 commit comments

Comments
 (0)