opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-12 00:35:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26704 from shiavm006/fix-ancestor-filter-docker-compatibility

Browse Source 
Fix ancestor filter to support Docker-compatible substring matching
This commit is contained in:
openshift-merge-bot[bot]
2025-07-31 16:02:51 +00:00
committed by GitHub
parent 7a3d99cc0d b5d18e873f
commit 0389651436
2 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/domain/filters/containers.go
View File

@ -107,8 +107,13 @@ func GenerateContainerFilterFuncs(filter string, filterValues []string, r *libpo
imageTag = tag imageTag = tag
} }
if (rootfsImageID == filterValue) || // Check for substring match on image ID (Docker compatibility)
util.StringMatchRegexSlice(rootfsImageName, filterValues) || if strings.Contains(rootfsImageID, filterValue) {
return true
}
// Check for regex match (advanced use cases)
if util.StringMatchRegexSlice(rootfsImageName, filterValues) ||
(util.StringMatchRegexSlice(imageNameWithoutTag, filterValues) && imageTag == "latest") { (util.StringMatchRegexSlice(imageNameWithoutTag, filterValues) && imageTag == "latest") {
return true return true
} }
@ -363,8 +368,13 @@ func GenerateExternalContainerFilterFuncs(filter string, filterValues []string,
imageTag = tag imageTag = tag
} }
if (listContainer.ImageID == filterValue) || // Check for substring match on image ID (Docker compatibility)
util.StringMatchRegexSlice(listContainer.Image, filterValues) || if strings.Contains(listContainer.ImageID, filterValue) {
return true
}
// Check for regex match (advanced use cases)
if util.StringMatchRegexSlice(listContainer.Image, filterValues) ||
(util.StringMatchRegexSlice(imageNameWithoutTag, filterValues) && imageTag == "latest") { (util.StringMatchRegexSlice(imageNameWithoutTag, filterValues) && imageTag == "latest") {
return true return true
} }

40
test/e2e/ps_test.go
View File

@ -334,25 +334,38 @@ var _ = Describe("Podman ps", func() {
Expect(result.OutputToString()).To(Equal("")) Expect(result.OutputToString()).To(Equal(""))
}) })
It("podman ps ancestor filter with substring matching (Docker compatibility)", func() {
// Create a container to test with
_, ec, cid := podmanTest.RunLsContainer("test1")
Expect(ec).To(Equal(0))
// Get the full image ID to test substring matching
inspect := podmanTest.PodmanExitCleanly("inspect", cid, "--format", "{{.Image}}")
fullImageID := inspect.OutputToString()
// Test with prefix substring of image ID (Docker compatibility, new functionality)
imageIDPrefix := fullImageID[:12]
result := podmanTest.PodmanExitCleanly("ps", "-q", "--no-trunc", "-a", "--filter", "ancestor="+imageIDPrefix)
Expect(result.OutputToString()).To(Equal(cid))
// Test with non-prefix substring of image ID (Docker compatibility)
imageIDSubstr := fullImageID[4:16]
result = podmanTest.PodmanExitCleanly("ps", "-q", "--no-trunc", "-a", "--filter", "ancestor="+imageIDSubstr)
Expect(result.OutputToString()).To(Equal(cid))
// Test with non-existent substring (should not match)
result = podmanTest.PodmanExitCleanly("ps", "-q", "--no-trunc", "-a", "--filter", "ancestor=nonexistent")
Expect(result.OutputToString()).To(Equal(""))
})
It("podman ps id filter flag", func() { It("podman ps id filter flag", func() {
_, ec, fullCid := podmanTest.RunLsContainer("") _, ec, fullCid := podmanTest.RunLsContainer("")
Expect(ec).To(Equal(0)) Expect(ec).To(Equal(0))
result := podmanTest.Podman([]string{"ps", "-a", "--filter", fmt.Sprintf("id=%s", fullCid)}) result := podmanTest.Podman([]string{"ps", "-aq", "--no-trunc", "--filter", fmt.Sprintf("id=%s", fullCid)})
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result).Should(ExitCleanly()) Expect(result).Should(ExitCleanly())
}) Expect(result.OutputToString()).To(Equal(fullCid))
It("podman ps id filter flag", func() {
session := podmanTest.RunTopContainer("")
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
fullCid := session.OutputToString()
result := podmanTest.Podman([]string{"ps", "-aq", "--no-trunc", "--filter", "status=running"})
result.WaitWithDefaultTimeout()
Expect(result).Should(ExitCleanly())
Expect(result.OutputToStringArray()[0]).To(Equal(fullCid))
}) })
It("podman ps multiple filters", func() { It("podman ps multiple filters", func() {
@ -1033,4 +1046,5 @@ var _ = Describe("Podman ps", func() {
Expect(output).To(HaveLen(1)) Expect(output).To(HaveLen(1))
Expect(output).Should(ContainElement(ContainSubstring("late"))) Expect(output).Should(ContainElement(ContainSubstring("late")))
}) })
}) })