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

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

Browse Source 
Only get rootfs when we need to calculate the image size
Upstream-commit: 45ecdf9c8e468bb93a96665fe92e526dabf2ee43
Component: engine
This commit is contained in:
Michael Crosby
2014-01-07 14:47:31 -08:00
parent 0055a569e4 914d9d5f46
commit f676391bcd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/engine/graph.go
View File

@ -87,17 +87,17 @@ func (graph *Graph) Get(name string) (*Image, error) {
if err != nil {
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 {
return nil, fmt.Errorf("Image stored at '%s' has wrong id '%s'", id, img.ID)
}
img.graph = graph
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
if img.Parent == "" {
if size, err = utils.TreeSize(rootfs); err != nil {