diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-04 17:46:54 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-05 21:46:57 +0000 |
| commit | 7b2b2bc631718cd2e6640f66551f8f41e8bf99d3 (patch) | |
| tree | cb8bfa05a8ec99ed19ca8d9c10abe1bd4fbaeb5c | |
| parent | 93c1722caab372f873765041d2bd2b710de3c5c4 (diff) | |
| download | podman-7b2b2bc631718cd2e6640f66551f8f41e8bf99d3.tar.gz podman-7b2b2bc631718cd2e6640f66551f8f41e8bf99d3.tar.bz2 podman-7b2b2bc631718cd2e6640f66551f8f41e8bf99d3.zip | |
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
| -rw-r--r-- | cmd/podman/images.go | 28 | ||||
| -rw-r--r-- | completions/bash/podman | 20 | ||||
| -rw-r--r-- | 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 |