Skip to content

Fix ancestor filter to resolve image names to IDs #27778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZaidMarwat wants to merge 1 commit into
base: main
Choose a base branch
from
+43 −35
Open

Fix ancestor filter to resolve image names to IDs #27778

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 43 additions & 35 deletions pkg/domain/filters/containers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,27 +92,31 @@ func GenerateContainerFilterFuncs(filter string, filterValues []string, r *libpo
case "ancestor":
// This needs to refine to match docker
// - ancestor=(<image-name>[:tag]|<image-id>| ⟨image@digest⟩) - containers created from an image or a descendant.
imgRuntime := r.LibimageRuntime()
Copy link
Member

@Honny1 Honny1 Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both changes in the "ancestor" case seem similar. I would like to see some deduplication to keep it DRY.

Copy link
Member

@mheon mheon Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of this feels like it ought to be in the returned function, not here?

var resolvedIDs []string
var passthrough []string
Copy link
Member

@Honny1 Honny1 Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is not necessary because LookupImage also accepts IDs.

for _, filterValue := range filterValues {
img, _, err := imgRuntime.LookupImage(filterValue, nil)
if err == nil && img != nil {
// filterValue is a resolvable image name[:tag]
Copy link
Member

@Honny1 Honny1 Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI is not happy

pkg/domain/filters/containers.go:101:1: File is not properly formatted (gofumpt)
				// filterValue is a resolvable image name[:tag] 
^
1 issues:

// Store the image's ID
resolvedIDs = append(resolvedIDs, img.ID())
continue
}
// Not resolvable as a name (possibly ID)
passthrough = append(passthrough, filterValue)
}
return func(c *libpod.Container) bool {
for _, filterValue := range filterValues {
rootfsImageID, rootfsImageName := c.Image()
var imageTag string
var imageNameWithoutTag string
// Compare with ImageID, ImageName
// Will match ImageName if running image has tag latest for other tags exact complete filter must be given
name, tag, hasColon := strings.Cut(rootfsImageName, ":")
if hasColon {
imageNameWithoutTag = name
imageTag = tag
}

// Check for substring match on image ID (Docker compatibility)
if strings.Contains(rootfsImageID, filterValue) {
rootfsImageID, _ := c.Image()
// Check ID match for resolved names
for _, id := range resolvedIDs {
if strings.Contains(rootfsImageID, id) {
return true
}

// Check for regex match (advanced use cases)
if util.StringMatchRegexSlice(rootfsImageName, filterValues) ||
(util.StringMatchRegexSlice(imageNameWithoutTag, filterValues) && imageTag == "latest") {
}
// Check if given ID matches ancestor ID
for _, id := range passthrough {
if strings.Contains(rootfsImageID, id) {
return true
}
}
Expand Down Expand Up @@ -361,26 +365,30 @@ func GenerateExternalContainerFilterFuncs(filter string, filterValues []string,
case "ancestor":
// This needs to refine to match docker
// - ancestor=(<image-name>[:tag]|<image-id>| ⟨image@digest⟩) - containers created from an image or a descendant.
return func(listContainer *types.ListContainer) bool {
for _, filterValue := range filterValues {
var imageTag string
var imageNameWithoutTag string
// Compare with ImageID, ImageName
// Will match ImageName if running image has tag latest for other tags exact complete filter must be given
name, tag, hasColon := strings.Cut(listContainer.Image, ":")
if hasColon {
imageNameWithoutTag = name
imageTag = tag
}
imgRuntime := r.LibimageRuntime()
var resolvedIDs []string
var passthrough []string
Copy link
Member

@Honny1 Honny1 Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

for _, filterValue := range filterValues {
img, _, err := imgRuntime.LookupImage(filterValue, nil)
if err == nil && img != nil {
// filterValue is a resolvable image name[:tag]
// Store the image's ID
resolvedIDs = append(resolvedIDs, img.ID())
continue
}
// Not resolvable as a name (possibly ID)
passthrough = append(passthrough, filterValue)
}

// Check for substring match on image ID (Docker compatibility)
if strings.Contains(listContainer.ImageID, filterValue) {
return func(listContainer *types.ListContainer) bool {
for _, id := range resolvedIDs {
if strings.Contains(listContainer.ImageID, id) {
return true
}

// Check for regex match (advanced use cases)
if util.StringMatchRegexSlice(listContainer.Image, filterValues) ||
(util.StringMatchRegexSlice(imageNameWithoutTag, filterValues) && imageTag == "latest") {
}
for _, id := range passthrough {
id = strings.TrimPrefix(id, "sha256:")
if strings.Contains(listContainer.ImageID, id) {
return true
}
}
Expand Down