docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3487 from crosbymichael/improve-images-speed 

Only get rootfs when we need to calculate the image size
This commit is contained in:
Michael Crosby 2014-01-07 14:47:31 -08:00
parent b942f24ba8 fa14a1b983
commit 45ecdf9c8e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
graph.go
View File

@ -87,17 +87,17 @@ func (graph *Graph) Get(name string) (*Image, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
// Check that the filesystem layer exists
rootfs, err := graph.driver.Get(img.ID)
if err != nil {
return nil, fmt.Errorf("Driver %s failed to get image rootfs %s: %s", graph.driver, img.ID, err)
}
if img.ID != id { if img.ID != id {
return nil, fmt.Errorf("Image stored at '%s' has wrong id '%s'", id, img.ID) return nil, fmt.Errorf("Image stored at '%s' has wrong id '%s'", id, img.ID)
} }
img.graph = graph img.graph = graph
if img.Size < 0 { if img.Size < 0 {
rootfs, err := graph.driver.Get(img.ID)
if err != nil {
return nil, fmt.Errorf("Driver %s failed to get image rootfs %s: %s", graph.driver, img.ID, err)
}
var size int64 var size int64
if img.Parent == "" { if img.Parent == "" {
if size, err = utils.TreeSize(rootfs); err != nil { if size, err = utils.TreeSize(rootfs); err != nil {