Merge pull request #10074 from flouthoc/ancestor-truncate-bug

Fix podman ps --filter ancestor to match exact ImageName/ImageID
This commit is contained in:
OpenShift Merge Robot
2021-04-26 20:23:54 -04:00
committed by GitHub
2 changed files with 19 additions and 1 deletions

View File

@@ -83,7 +83,19 @@ func GenerateContainerFilterFuncs(filter string, filterValues []string, r *libpo
return func(c *libpod.Container) bool {
for _, filterValue := range filterValues {
containerConfig := c.Config()
if strings.Contains(containerConfig.RootfsImageID, filterValue) || strings.Contains(containerConfig.RootfsImageName, filterValue) {
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
imageNameSlice := strings.SplitN(containerConfig.RootfsImageName, ":", 2)
if len(imageNameSlice) == 2 {
imageNameWithoutTag = imageNameSlice[0]
imageTag = imageNameSlice[1]
}
if (containerConfig.RootfsImageID == filterValue) ||
(containerConfig.RootfsImageName == filterValue) ||
(imageNameWithoutTag == filterValue && imageTag == "latest") {
return true
}
}