Fix duplicate results in podman images <image>

Fixes: #25725
Fixes: https://issues.redhat.com/browse/RUN-2726

Signed-off-by: Jan Rodák <[email protected]>

Author: Honny1

cmd/podman/images/list.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"regexp"
 	"slices"
 	"strings"
 	"time"
@@ -128,10 +129,27 @@ func images(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	imgs, err := sortImages(summaries)
+	reference := ""
+	for _, filter := range listOptions.Filter {
+		if strings.HasPrefix(filter, "reference=") {
+			reference = strings.TrimPrefix(filter, "reference=")
+			if strings.HasPrefix(reference, "sha256:") {
+				reference = ""
+				break
+			}
+			reference, _, _ = tokenRepoTag(reference)
+			if strings.Contains(reference, "<none>") {
+				reference = ""
+			}
+			break
+		}
+	}
+
+	imgs, err := sortImages(summaries, reference)
 	if err != nil {
 		return err
 	}
+
 	switch {
 	case report.IsJSON(listFlag.format):
 		return writeJSON(imgs)
@@ -214,9 +232,16 @@ func writeTemplate(cmd *cobra.Command, imgs []imageReporter) error {
 	return rpt.Execute(imgs)
 }
 
-func sortImages(imageS []*entities.ImageSummary) ([]imageReporter, error) {
-	imgs := make([]imageReporter, 0, len(imageS))
+func sortImages(imageS []*entities.ImageSummary, reference string) ([]imageReporter, error) {
 	var err error
+	var referenceRegex *regexp.Regexp
+	if reference != "" {
+		referenceRegex, err = regexp.Compile(reference + "$")
+		if err != nil {
+			return nil, err
+		}
+	}
+	imgs := make([]imageReporter, 0, len(imageS))
 	for _, e := range imageS {
 		var h imageReporter
 		if len(e.RepoTags) > 0 {
@@ -237,7 +262,12 @@ func sortImages(imageS []*entities.ImageSummary) ([]imageReporter, error) {
 			// Note: we only want to display "<none>" if we
 			// couldn't find any tagged name in RepoTags.
 			if len(tagged) > 0 {
-				imgs = append(imgs, tagged...)
+				for _, i := range tagged {
+					if reference != "" && !referenceRegex.MatchString(i.Repository) {
+						continue
+					}
+					imgs = append(imgs, i)
+				}
 			} else {
 				imgs = append(imgs, untagged[0])
 			}

test/e2e/images_test.go

@@ -547,4 +547,16 @@ LABEL xyz="bar"
 		Expect(session.OutputToString()).To(ContainSubstring("test-abc-xyz"))
 	})
 
+	It("podman images <image> show duplicate images", func() {
+		containerFile := "FROM quay.io/libpod/alpine:latest"
+		imageName := "exampletestimage"
+		podmanTest.BuildImage(containerFile, imageName, "false")
+
+		result := podmanTest.PodmanExitCleanly("images", imageName)
+
+		Expect(result.OutputToStringArray()).To(HaveLen(2))
+		Expect(result.OutputToString()).To(ContainSubstring(imageName))
+		Expect(result.OutputToString()).ToNot(ContainSubstring("alpine"))
+	})
+
 })