kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Revert "Make sure the cache lookup returns always the same result"

Browse source 
This reverts commit 1d4b7d8fa1.

Docker-DCO-1.0-Signed-off-by: Sjoerd Langkemper <sjoerd@byte.nl> (github: Sjord)
This commit is contained in:
Sjoerd Langkemper 2014-01-07 09:15:04 +01:00
parent fca83b4cfb
commit 10b794b332
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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,13 +1696,16 @@ 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{})
}
imageMap[img.Parent][img.ID] = struct{}{}
} }
sort.Strings(imageMap[imgID])
// 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] { 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