From 3f6197e3d2a55ab843dee7be922706a079d875a4 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Wed, 18 Nov 2020 09:09:53 -0700
Subject: Fix `podman images...` missing headers in table templates

Signed-off-by: Jhon Honce <jhonce@redhat.com>
---
 cmd/podman/images/list.go   |  4 ++--
 test/e2e/images_test.go     |  2 +-
 test/system/010-images.bats | 13 ++++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
index bcb31e6ee..8a7951923 100644
--- a/cmd/podman/images/list.go
+++ b/cmd/podman/images/list.go
@@ -126,8 +126,8 @@ func images(cmd *cobra.Command, args []string) error {
 	case listFlag.quiet:
 		return writeID(imgs)
 	default:
-		if cmd.Flag("format").Changed {
-			listFlag.noHeading = true // V1 compatibility
+		if cmd.Flags().Changed("format") && !parse.HasTable(listFlag.format) {
+			listFlag.noHeading = true
 		}
 		return writeTemplate(imgs)
 	}
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go
index 4c65a85d5..e045718ac 100644
--- a/test/e2e/images_test.go
+++ b/test/e2e/images_test.go
@@ -278,7 +278,7 @@ WORKDIR /test
 	It("podman images sort by values", func() {
 		sortValueTest := func(value string, result int, format string) []string {
 			f := fmt.Sprintf("{{.%s}}", format)
-			session := podmanTest.Podman([]string{"images", "--sort", value, "--format", f})
+			session := podmanTest.Podman([]string{"images", "--noheading", "--sort", value, "--format", f})
 			session.WaitWithDefaultTimeout()
 			Expect(session).Should(Exit(result))
 
diff --git a/test/system/010-images.bats b/test/system/010-images.bats
index 98bb0cc57..7379e5571 100644
--- a/test/system/010-images.bats
+++ b/test/system/010-images.bats
@@ -197,9 +197,16 @@ Labels.created_at | 20[0-9-]\\\+T[0-9:]\\\+Z
         local format=$2
 
         run_podman images --sort repository --format "$format"
-        _check_line 0 ${aaa_name} ${aaa_tag}
-        _check_line 1 "${PODMAN_TEST_IMAGE_REGISTRY}/${PODMAN_TEST_IMAGE_USER}/${PODMAN_TEST_IMAGE_NAME}" "${PODMAN_TEST_IMAGE_TAG}"
-        _check_line 2 ${zzz_name} ${zzz_tag}
+
+        line_no=0
+        if [[ $format == table* ]]; then
+            # skip headers from table command
+            line_no=1
+        fi
+
+        _check_line $line_no ${aaa_name} ${aaa_tag}
+        _check_line $((line_no+1)) "${PODMAN_TEST_IMAGE_REGISTRY}/${PODMAN_TEST_IMAGE_USER}/${PODMAN_TEST_IMAGE_NAME}" "${PODMAN_TEST_IMAGE_TAG}"
+        _check_line $((line_no+2)) ${zzz_name} ${zzz_tag}
     }
 
     # Begin the test: tag $IMAGE with both the given names
-- 
cgit v1.2.3-54-g00ecf