summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-13 10:57:03 -0700
committerGitHub <noreply@github.com>2019-03-13 10:57:03 -0700
commit31b09d2f7329dfac6a6ac17bc821ecaf59bd6e6b (patch)
tree68ae0c3bd7f61945ab1e01880e2a6604e08d77de
parent1fa664166571ab7dd3abe1b0d64ae9a81a8688ae (diff)
parent360487ab6d6bc7a38caab3a5b3f4c9a632675738 (diff)
downloadpodman-31b09d2f7329dfac6a6ac17bc821ecaf59bd6e6b.tar.gz
podman-31b09d2f7329dfac6a6ac17bc821ecaf59bd6e6b.tar.bz2
podman-31b09d2f7329dfac6a6ac17bc821ecaf59bd6e6b.zip
Merge pull request #2629 from edsantiago/add-events-to-podman-1
Add 'podman events' to podman(1)
-rw-r--r--cmd/podman/events.go3
-rw-r--r--docs/podman.1.md1
2 files changed, 3 insertions, 1 deletions
diff --git a/cmd/podman/events.go b/cmd/podman/events.go
index dda9a03f9..f6c20e8ff 100644
--- a/cmd/podman/events.go
+++ b/cmd/podman/events.go
@@ -11,7 +11,8 @@ var (
eventsCommand cliconfig.EventValues
eventsDescription = "Monitor podman events"
_eventsCommand = &cobra.Command{
- Use: "events [flags]",
+ Use: "events",
+ Args: noSubArgs,
Short: "show podman events",
Long: eventsDescription,
RunE: func(cmd *cobra.Command, args []string) error {
diff --git a/docs/podman.1.md b/docs/podman.1.md
index 0182690d0..c4dc168c7 100644
--- a/docs/podman.1.md
+++ b/docs/podman.1.md
@@ -137,6 +137,7 @@ the exit codes follow the `chroot` standard, see below:
| [podman-cp(1)](podman-cp.1.md) | Copy files/folders between a container and the local filesystem. |
| [podman-create(1)](podman-create.1.md) | Create a new container. |
| [podman-diff(1)](podman-diff.1.md) | Inspect changes on a container or image's filesystem. |
+| [podman-events(1)](podman-events.1.md) | Monitor Podman events |
| [podman-exec(1)](podman-exec.1.md) | Execute a command in a running container. |
| [podman-export(1)](podman-export.1.md) | Export a container's filesystem contents as a tar archive. |
| [podman-generate(1)](podman-generate.1.md)| Generate structured data based for a containers and pods. |