beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

c8d/list: Implement reference filter

Browse source 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski 2023-04-04 17:44:55 +02:00
parent be541997af
commit ba47cdcc0b
No known key found for this signature in database
GPG key ID: B85EFCFE26DEF92A
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
daemon/containerd/image_list.go
View file

@ -25,7 +25,7 @@ var acceptedImageFilterTags = map[string]bool{
"label": true,
"before": true,
"since": true,
"reference": false, // TODO(thaJeztah): implement "reference" filter: see https://github.com/moby/moby/issues/43847
"reference": true,
}
// Images returns a filtered list of images.
@ -40,12 +40,12 @@ func (i *ImageService) Images(ctx context.Context, opts types.ImageListOptions)
return nil, err
}
filter, err := i.setupFilters(ctx, opts.Filters)
listFilters, filter, err := i.setupFilters(ctx, opts.Filters)
if err != nil {
return nil, err
}
imgs, err := i.client.ImageService().List(ctx)
imgs, err := i.client.ImageService().List(ctx, listFilters...)
if err != nil {
return nil, err
}
@ -254,7 +254,7 @@ type imageFilterFunc func(image images.Image) bool
// setupFilters constructs an imageFilterFunc from the given imageFilters.
//
// TODO(thaJeztah): reimplement filters using containerd filters: see https://github.com/moby/moby/issues/43845
func (i *ImageService) setupFilters(ctx context.Context, imageFilters filters.Args) (imageFilterFunc, error) {
func (i *ImageService) setupFilters(ctx context.Context, imageFilters filters.Args) ([]string, imageFilterFunc, error) {
var fltrs []imageFilterFunc
err := imageFilters.WalkValues("before", func(value string) error {
ref, err := reference.ParseDockerRef(value)
@ -272,7 +272,7 @@ func (i *ImageService) setupFilters(ctx context.Context, imageFilters filters.Ar
return err
})
if err != nil {
return nil, err
return nil, nil, err
}
err = imageFilters.WalkValues("since", func(value string) error {
@ -291,7 +291,7 @@ func (i *ImageService) setupFilters(ctx context.Context, imageFilters filters.Ar
return err
})
if err != nil {
return nil, err
return nil, nil, err
}
if imageFilters.Contains("label") {
@ -303,14 +303,28 @@ func (i *ImageService) setupFilters(ctx context.Context, imageFilters filters.Ar
if imageFilters.Contains("dangling") {
danglingValue, err := imageFilters.GetBoolOrDefault("dangling", false)
if err != nil {
return nil, err
return nil, nil, err
}
fltrs = append(fltrs, func(image images.Image) bool {
return danglingValue == isDanglingImage(image)
})
}
return func(image images.Image) bool {
var listFilters []string
err = imageFilters.WalkValues("reference", func(value string) error {
ref, err := reference.ParseNormalizedNamed(value)
if err != nil {
return err
}
ref = reference.TagNameOnly(ref)
listFilters = append(listFilters, "name=="+ref.String())
return nil
})
if err != nil {
return nil, nil, err
}
return listFilters, func(image images.Image) bool {
for _, filter := range fltrs {
if !filter(image) {
return false