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

Merge pull request #3417 from Sjord/use-most-recent-cache-image 

Fix issue #3375 - Return most recent image from the cache
This commit is contained in:
Guillaume J. Charmes 2014-01-08 15:30:36 -08:00
parent 1d0d093d0b 46c8b11f24
commit 3be2ea021d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server.go
View File

@ -22,7 +22,6 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"runtime" "runtime"
"sort"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
@ -1697,22 +1696,28 @@ func (srv *Server) ImageGetCached(imgID string, config *Config) (*Image, error)
} }
// Store the tree in a map of map (map[parentId][childId]) // Store the tree in a map of map (map[parentId][childId])
imageMap := make(map[string][]string) imageMap := make(map[string]map[string]struct{})
for _, img := range images { for _, img := range images {
imageMap[img.Parent] = append(imageMap[img.Parent], img.ID) if _, exists := imageMap[img.Parent]; !exists {
imageMap[img.Parent] = make(map[string]struct{})
} }
sort.Strings(imageMap[imgID]) imageMap[img.Parent][img.ID] = struct{}{}
}
// Loop on the children of the given image and check the config // Loop on the children of the given image and check the config
for _, elem := range imageMap[imgID] { var match *Image
for elem := range imageMap[imgID] {
img, err := srv.runtime.graph.Get(elem) img, err := srv.runtime.graph.Get(elem)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if CompareConfig(&img.ContainerConfig, config) { if CompareConfig(&img.ContainerConfig, config) {
return img, nil if match == nil || match.Created.Before(img.Created) {
match = img
} }
} }
return nil, nil }
return match, nil
} }
func (srv *Server) RegisterLinks(container *Container, hostConfig *HostConfig) error { func (srv *Server) RegisterLinks(container *Container, hostConfig *HostConfig) error {