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

fix bug with creation time in ParseFilter()

Browse source 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
This commit is contained in:
Ryan Cole 2017-08-03 15:34:25 -04:00
parent d4f023918c
commit 0a62304adf
1 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
libkpod/image/image.go
View file

@ -44,13 +44,21 @@ func ParseFilter(store storage.Store, filter string) (*FilterParams, error) {
params.label = pair[1] params.label = pair[1]
case "before": case "before":
if img, err := findImageInSlice(images, pair[1]); err == nil { if img, err := findImageInSlice(images, pair[1]); err == nil {
params.beforeImage = img.Created info, err := getImageInspectInfo(store, img)
if err != nil {
return nil, err
}
params.beforeImage = info.Created
} else { } else {
return nil, fmt.Errorf("no such id: %s", pair[0]) return nil, fmt.Errorf("no such id: %s", pair[0])
} }
case "since": case "since":
if img, err := findImageInSlice(images, pair[1]); err == nil { if img, err := findImageInSlice(images, pair[1]); err == nil {
params.sinceImage = img.Created info, err := getImageInspectInfo(store, img)
if err != nil {
return nil, err
}
params.sinceImage = info.Created
} else { } else {
return nil, fmt.Errorf("no such id: %s``", pair[0]) return nil, fmt.Errorf("no such id: %s``", pair[0])
} }
@ -68,20 +76,10 @@ func matchesFilter(store storage.Store, image storage.Image, name string, params
return true return true
} }
storeRef, err := is.Transport.ParseStoreReference(store, "@"+image.ID) info, err := getImageInspectInfo(store, image)
if err != nil { if err != nil {
return false return false
} }
img, err := storeRef.NewImage(nil)
if err != nil {
return false
}
defer img.Close()
info, err := img.Inspect()
if err != nil {
return false
}
if params.dangling != "" && !matchesDangling(name, params.dangling) { if params.dangling != "" && !matchesDangling(name, params.dangling) {
return false return false
} else if params.label != "" && !matchesLabel(info, store, params.label) { } else if params.label != "" && !matchesLabel(info, store, params.label) {
@ -151,7 +149,7 @@ func MatchesID(id, argID string) bool {
// But redis:alpine, ry/redis, library, and io/library/redis will not // But redis:alpine, ry/redis, library, and io/library/redis will not
func MatchesReference(name, argName string) bool { func MatchesReference(name, argName string) bool {
if argName == "" { if argName == "" {
return true return false
} }
splitName := strings.Split(name, ":") splitName := strings.Split(name, ":")
// If the arg contains a tag, we handle it differently than if it does not // If the arg contains a tag, we handle it differently than if it does not
@ -273,7 +271,7 @@ func GetImagesMatchingFilter(store storage.Store, filter *FilterParams, argName
names = append(names, "<none>") names = append(names, "<none>")
} }
for _, name := range names { for _, name := range names {
if filter == nil || (matchesFilter(store, image, name, filter) || MatchesReference(name, argName)) { if (filter == nil && argName == "") || (filter != nil && matchesFilter(store, image, name, filter)) || MatchesReference(name, argName) {
newImage := image newImage := image
newImage.Names = []string{name} newImage.Names = []string{name}
filteredImages = append(filteredImages, newImage) filteredImages = append(filteredImages, newImage)
@ -282,3 +280,16 @@ func GetImagesMatchingFilter(store storage.Store, filter *FilterParams, argName
} }
return filteredImages, nil return filteredImages, nil
} }
func getImageInspectInfo(store storage.Store, image storage.Image) (*types.ImageInspectInfo, error) {
storeRef, err := is.Transport.ParseStoreReference(store, "@"+image.ID)
if err != nil {
return nil, err
}
img, err := storeRef.NewImage(nil)
if err != nil {
return nil, err
}
defer img.Close()
return img.Inspect()
}