From 7b2b2bc631718cd2e6640f66551f8f41e8bf99d3 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon, 4 Jun 2018 17:46:54 -0400
Subject: Add --all flag even though it is a noop so scripts will work

Until podman build supports caching, their are no intermediary builds,
but people might still use scripts that use the --all option.
Adding this will not hurt anything and could fix scripts.

Also fixed sorting issues in options handling of images

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #896
Approved by: mheon
---
 cmd/podman/images.go    | 28 ++++++++++++++++------------
 completions/bash/podman | 20 ++++++++++++--------
 docs/podman-images.1.md |  4 ++++
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/cmd/podman/images.go b/cmd/podman/images.go
index 6c8af4512..918015937 100644
--- a/cmd/podman/images.go
+++ b/cmd/podman/images.go
@@ -54,8 +54,20 @@ func (a imagesSorted) Less(i, j int) bool { return a[i].CreatedTime.After(a[j].C
 var (
 	imagesFlags = []cli.Flag{
 		cli.BoolFlag{
-			Name:  "quiet, q",
-			Usage: "display only image IDs",
+			Name:  "all, a",
+			Usage: "Show all images (default hides intermediate images)",
+		},
+		cli.BoolFlag{
+			Name:  "digests",
+			Usage: "show digests",
+		},
+		cli.StringSliceFlag{
+			Name:  "filter, f",
+			Usage: "filter output based on conditions provided (default [])",
+		},
+		cli.StringFlag{
+			Name:  "format",
+			Usage: "Change the output format to JSON or a Go template",
 		},
 		cli.BoolFlag{
 			Name:  "noheading, n",
@@ -66,16 +78,8 @@ var (
 			Usage: "do not truncate output",
 		},
 		cli.BoolFlag{
-			Name:  "digests",
-			Usage: "show digests",
-		},
-		cli.StringFlag{
-			Name:  "format",
-			Usage: "Change the output format to JSON or a Go template",
-		},
-		cli.StringSliceFlag{
-			Name:  "filter, f",
-			Usage: "filter output based on conditions provided (default [])",
+			Name:  "quiet, q",
+			Usage: "display only image IDs",
 		},
 	}
 
diff --git a/completions/bash/podman b/completions/bash/podman
index 9a68e3ef5..12e4bb523 100644
--- a/completions/bash/podman
+++ b/completions/bash/podman
@@ -888,16 +888,20 @@ _podman_info() {
 
 _podman_images() {
     local boolean_options="
-     --help
-     -h
-     --quiet
-     -q
-     --noheading
-     -n
-     --no-trunc
+     -a
+     --all
+     --digests
      --digests
-     --filter
      -f
+     --filter
+     -h
+     --help
+     --no-trunc
+     --notruncate
+     -n
+     --noheading
+     -q
+     --quiet
      "
     local options_with_args="
     --format
diff --git a/docs/podman-images.1.md b/docs/podman-images.1.md
index 85a012f65..4c0073425 100644
--- a/docs/podman-images.1.md
+++ b/docs/podman-images.1.md
@@ -11,6 +11,10 @@ Displays locally stored images, their names, and their IDs.
 
 ## OPTIONS
 
+**--all, -a**
+
+Show all images (by default filter out the intermediate image layers). The default is false. (This is a NOOP until podman build supports caching.)
+
 **--digests**
 
 Show image digests
-- 
cgit v1.2.3-54-g00ecf