2 files changed, 51 insertions, 6 deletions

diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go
index c2ef7d767..c8ea4b04a 100644
--- a/cmd/podman/images/search.go
+++ b/cmd/podman/images/search.go
@@ -26,6 +26,12 @@ type searchOptionsWrapper struct {
 	Format       string // For go templating
 }
 
+// listEntryTag is a utility structure used for json serialization.
+type listEntryTag struct {
+	Name string
+	Tags []string
+}
+
 var (
 	searchOptions     = searchOptionsWrapper{}
 	searchDescription = `Search registries for a given image. Can search all the default registries or a specific registry.
@@ -149,14 +155,13 @@ func imageSearch(cmd *cobra.Command, args []string) error {
 		if len(searchOptions.Filters) != 0 {
 			return errors.Errorf("filters are not applicable to list tags result")
 		}
+		if report.IsJSON(searchOptions.Format) {
+			listTagsEntries := buildListTagsJson(searchReport)
+			return printJson(listTagsEntries)
+		}
 		row = "{{.Name}}\t{{.Tag}}\n"
 	case report.IsJSON(searchOptions.Format):
-		prettyJSON, err := json.MarshalIndent(searchReport, "", "    ")
-		if err != nil {
-			return err
-		}
-		fmt.Println(string(prettyJSON))
-		return nil
+		return printJson(searchReport)
 	case cmd.Flags().Changed("format"):
 		renderHeaders = parse.HasTable(searchOptions.Format)
 		row = report.NormalizeFormat(searchOptions.Format)
@@ -180,3 +185,33 @@ func imageSearch(cmd *cobra.Command, args []string) error {
 
 	return tmpl.Execute(w, searchReport)
 }
+
+func printJson(v interface{}) error {
+	prettyJSON, err := json.MarshalIndent(v, "", "    ")
+	if err != nil {
+		return err
+	}
+	fmt.Println(string(prettyJSON))
+	return nil
+}
+
+func buildListTagsJson(searchReport []entities.ImageSearchReport) []listEntryTag {
+	entries := []listEntryTag{}
+
+ReportLoop:
+	for _, report := range searchReport {
+		for idx, entry := range entries {
+			if entry.Name == report.Name {
+				entries[idx].Tags = append(entries[idx].Tags, report.Tag)
+				continue ReportLoop
+			}
+		}
+		newElem := listEntryTag{
+			report.Name,
+			[]string{report.Tag},
+		}
+
+		entries = append(entries, newElem)
+	}
+	return entries
+}
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
index f809c5afe..1d86ae744 100644
--- a/test/e2e/search_test.go
+++ b/test/e2e/search_test.go
@@ -124,6 +124,16 @@ registries = ['{{.Host}}:{{.Port}}']`
 		Expect(search.OutputToString()).To(ContainSubstring("docker.io/library/alpine"))
 	})
 
+	It("podman search format json list tags", func() {
+		search := podmanTest.Podman([]string{"search", "--list-tags", "--format", "json", "alpine"})
+		search.WaitWithDefaultTimeout()
+		Expect(search.ExitCode()).To(Equal(0))
+		Expect(search.IsJSONOutputValid()).To(BeTrue())
+		Expect(search.OutputToString()).To(ContainSubstring("docker.io/library/alpine"))
+		Expect(search.OutputToString()).To(ContainSubstring("3.10"))
+		Expect(search.OutputToString()).To(ContainSubstring("2.7"))
+	})
+
 	It("podman search no-trunc flag", func() {
 		search := podmanTest.Podman([]string{"search", "--no-trunc", "alpine"})
 		search.WaitWithDefaultTimeout()