diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-23 11:37:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-23 11:37:26 -0800 |
| commit | 8fe30505acc1c58ab05771f2095ed3fd038c6df4 (patch) | |
| tree | 3ca5ccc95628815f68aca01819e2a21809e18a73 /cmd/podman | |
| parent | eb982193c5bb949ec75308e91d5698aebe4f9429 (diff) | |
| parent | a22f00d4c58fdaba479405b38bac1508ef889c7e (diff) | |
| download | podman-8fe30505acc1c58ab05771f2095ed3fd038c6df4.tar.gz podman-8fe30505acc1c58ab05771f2095ed3fd038c6df4.tar.bz2 podman-8fe30505acc1c58ab05771f2095ed3fd038c6df4.zip | |
Merge pull request #2044 from rhatdan/list
Allow alias for list, ls, ps to work
Diffstat (limited to 'cmd/podman')
| -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 { |