diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-23 19:09:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 19:09:45 +0100 |
| commit | 10c2c839c03e8eed799ccadd99fa8a962754255b (patch) | |
| tree | ed3c268d7ab175e5d6964c02b17ec0a9a78fa840 /docs | |
| parent | dd343418ce5a3fd6c6238d7e2edc132826756051 (diff) | |
| parent | c901a766fb66564df24538f761f895212168c923 (diff) | |
| download | podman-10c2c839c03e8eed799ccadd99fa8a962754255b.tar.gz podman-10c2c839c03e8eed799ccadd99fa8a962754255b.tar.bz2 podman-10c2c839c03e8eed799ccadd99fa8a962754255b.zip | |
Merge pull request #8446 from Luap99/podman-container-ps
Add podman container ps command
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/managecontainers.rst | 2 | ||||
| -rw-r--r-- | docs/source/markdown/links/podman-list.1 | 1 | ||||
| -rw-r--r-- | docs/source/markdown/links/podman-ls.1 | 1 | ||||
| -rw-r--r-- | docs/source/markdown/podman-container.1.md | 1 | ||||
| -rw-r--r-- | docs/source/markdown/podman-ps.1.md | 8 |
5 files changed, 5 insertions, 8 deletions
diff --git a/docs/source/managecontainers.rst b/docs/source/managecontainers.rst index 849fd1d25..9926f9996 100644 --- a/docs/source/managecontainers.rst +++ b/docs/source/managecontainers.rst @@ -39,6 +39,8 @@ Manage Containers :doc:`prune <markdown/podman-container-prune.1>` Remove all stopped containers +:doc:`ps <markdown/podman-ps.1>` List containers + :doc:`restart <markdown/podman-restart.1>` Restart one or more containers :doc:`restore <markdown/podman-container-restore.1>` Restores one or more containers from a checkpoint diff --git a/docs/source/markdown/links/podman-list.1 b/docs/source/markdown/links/podman-list.1 deleted file mode 100644 index f7f44c704..000000000 --- a/docs/source/markdown/links/podman-list.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/podman-ps.1 diff --git a/docs/source/markdown/links/podman-ls.1 b/docs/source/markdown/links/podman-ls.1 deleted file mode 100644 index f7f44c704..000000000 --- a/docs/source/markdown/links/podman-ls.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/podman-ps.1 diff --git a/docs/source/markdown/podman-container.1.md b/docs/source/markdown/podman-container.1.md index 0a6ceea33..9da5db601 100644 --- a/docs/source/markdown/podman-container.1.md +++ b/docs/source/markdown/podman-container.1.md @@ -32,6 +32,7 @@ The container command allows you to manage containers | pause | [podman-pause(1)](podman-pause.1.md) | Pause one or more containers. | | port | [podman-port(1)](podman-port.1.md) | List port mappings for the container. | | prune | [podman-container-prune(1)](podman-container-prune.1.md)| Remove all stopped containers from local storage. | +| ps | [podman-ps(1)](podman-ps.1.md) | Prints out information about containers. | | restart | [podman-restart(1)](podman-restart.1.md) | Restart one or more containers. | | restore | [podman-container-restore(1)](podman-container-restore.1.md) | Restores one or more containers from a checkpoint. | | rm | [podman-rm(1)](podman-rm.1.md) | Remove one or more containers. | diff --git a/docs/source/markdown/podman-ps.1.md b/docs/source/markdown/podman-ps.1.md index f542daf4c..b94964f6c 100644 --- a/docs/source/markdown/podman-ps.1.md +++ b/docs/source/markdown/podman-ps.1.md @@ -6,15 +6,11 @@ podman\-ps - Prints out information about containers ## SYNOPSIS **podman ps** [*options*] -**podman container list** [*options*] - -**podman container ls** [*options*] - **podman container ps** [*options*] -**podman list** [*options*] +**podman container list** [*options*] -**podman ls** [*options*] +**podman container ls** [*options*] ## DESCRIPTION **podman ps** lists the running containers on the system. Use the **--all** flag to view |