vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #860 from mrunalp/img_size_id

Browse source 
pkg: storage: image: get size from image ID
This commit is contained in:
Antonio Murdaca 2017-09-08 19:12:46 +02:00 committed by GitHub
commit 6d2b19acbb
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/storage/image.go
View file

@ -90,10 +90,12 @@ func (svc *imageService) ListImages(systemContext *types.SystemContext, filter s
if err != nil { if err != nil {
return nil, err return nil, err
} }
size := imageSize(img)
img.Close()
results = append(results, ImageResult{ results = append(results, ImageResult{
ID: image.ID, ID: image.ID,
Names: image.Names, Names: image.Names,
Size: imageSize(img), Size: size,
}) })
} }
} else { } else {
@ -102,9 +104,7 @@ func (svc *imageService) ListImages(systemContext *types.SystemContext, filter s
return nil, err return nil, err
} }
for _, image := range images { for _, image := range images {
var size *uint64 ref, err := istorage.Transport.ParseStoreReference(svc.store, "@"+image.ID)
if len(image.Names) != 0 {
ref, err := svc.getRef(image.Names[0])
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -112,8 +112,8 @@ func (svc *imageService) ListImages(systemContext *types.SystemContext, filter s
if err != nil { if err != nil {
return nil, err return nil, err
} }
size = imageSize(img) size := imageSize(img)
} img.Close()
results = append(results, ImageResult{ results = append(results, ImageResult{
ID: image.ID, ID: image.ID,
Names: image.Names, Names: image.Names,