diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-12-22 07:28:21 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2018-12-23 09:38:57 -0500 |
| commit | a22f00d4c58fdaba479405b38bac1508ef889c7e (patch) | |
| tree | 80858474bac3f9103546ed334ac0509aff38885d /cmd | |
| parent | 792f10988ed2badcce9a11a880303614412b9a00 (diff) | |
| download | podman-a22f00d4c58fdaba479405b38bac1508ef889c7e.tar.gz podman-a22f00d4c58fdaba479405b38bac1508ef889c7e.tar.bz2 podman-a22f00d4c58fdaba479405b38bac1508ef889c7e.zip | |
Allow alias for list, ls, ps to work
Allow multiple alias for listing containers and images.
Also fix documentation for umount and unmount
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/container.go | 2 | ||||
| -rw-r--r-- | cmd/podman/images.go | 3 | ||||
| -rw-r--r-- | cmd/podman/ps.go | 13 |
3 files changed, 5 insertions, 13 deletions
diff --git a/cmd/podman/container.go b/cmd/podman/container.go index b0232c874..4bb6f287a 100644 --- a/cmd/podman/container.go +++ b/cmd/podman/container.go @@ -18,7 +18,7 @@ var ( inspectCommand, killCommand, logsCommand, - lsCommand, + psCommand, mountCommand, pauseCommand, portCommand, diff --git a/cmd/podman/images.go b/cmd/podman/images.go index a1aeb6042..522863b1b 100644 --- a/cmd/podman/images.go +++ b/cmd/podman/images.go @@ -131,7 +131,8 @@ var ( OnUsageError: usageErrorHandler, } lsImagesCommand = cli.Command{ - Name: "ls", + Name: "list", + Aliases: []string{"ls"}, Usage: "list images in local storage", Description: imagesDescription, Flags: imagesFlags, diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go index 7a4a80769..0ad3f4c73 100644 --- a/cmd/podman/ps.go +++ b/cmd/podman/ps.go @@ -207,7 +207,8 @@ var ( } psDescription = "Prints out information about the containers" psCommand = cli.Command{ - Name: "ps", + Name: "list", + Aliases: []string{"ls", "ps"}, Usage: "List containers", Description: psDescription, Flags: sortFlags(psFlags), @@ -216,16 +217,6 @@ var ( UseShortOptionHandling: true, OnUsageError: usageErrorHandler, } - lsCommand = cli.Command{ - Name: "ls", - Usage: "List containers", - Description: psDescription, - Flags: psFlags, - Action: psCmd, - ArgsUsage: "", - UseShortOptionHandling: true, - OnUsageError: usageErrorHandler, - } ) func psCmd(c *cli.Context) error { |