opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix podman ps --filter ancestor to match exact ImageName/ImageID

Browse Source 
Signed-off-by: flouthoc <flouthoc.git@gmail.com>
This commit is contained in:
flouthoc
2021-04-18 17:56:10 +05:30
parent ba60821f0a
commit b0ea40f551
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,19 @@ func GenerateContainerFilterFuncs(filter string, filterValues []string, r *libpo
return func(c *libpod.Container) bool { return func(c *libpod.Container) bool {
for _, filterValue := range filterValues { for _, filterValue := range filterValues {
containerConfig := c.Config() 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 return true
} }
} }

6
test/e2e/ps_test.go
View File

@ -269,6 +269,12 @@ var _ = Describe("Podman ps", func() {
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0)) Expect(result.ExitCode()).To(Equal(0))
Expect(result.OutputToString()).To(Equal(cid)) Expect(result.OutputToString()).To(Equal(cid))
// Query by trunctated image name should not match ( should return empty output )
result = podmanTest.Podman([]string{"ps", "-q", "--no-trunc", "-a", "--filter", "ancestor=quay.io/libpod/alpi"})
result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0))
Expect(result.OutputToString()).To(Equal(""))
}) })
It("podman ps id filter flag", func() { It("podman ps id filter flag", func() {