diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-04-02 22:06:18 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-03 17:13:43 +0000 |
| commit | 4640e7966769a128b30c2482cda8f3ef25eb77c9 (patch) | |
| tree | 00c15452fca114db6f3d72ec793b6c397cf3618f | |
| parent | 6fab1c1b780b5fde6d59d1ee7ac491b3df8e32bd (diff) | |
| download | podman-4640e7966769a128b30c2482cda8f3ef25eb77c9.tar.gz podman-4640e7966769a128b30c2482cda8f3ef25eb77c9.tar.bz2 podman-4640e7966769a128b30c2482cda8f3ef25eb77c9.zip | |
Add conmon-pidfile flag to bash completions/manpages
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #584
Approved by: rhatdan
| -rw-r--r-- | completions/bash/podman | 1 | ||||
| -rw-r--r-- | docs/podman-create.1.md | 3 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/completions/bash/podman b/completions/bash/podman index 4313fe94f..3cb48b156 100644 --- a/completions/bash/podman +++ b/completions/bash/podman @@ -1051,6 +1051,7 @@ _podman_container_run() { --cap-drop --cgroup-parent --cidfile + --conmon-pidfile --cpu-period --cpu-quota --cpu-rt-period diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index b28b785f1..e77acf2bd 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -52,6 +52,9 @@ each of stdin, stdout, and stderr. **--cidfile**="" Write the container ID to the file +**--conmon-pidfile**="" + Write the pid of the `conmon` process to a file. `conmon` daemonizes separate from Podman, so this is necessary when using systemd to restart Podman containers. + **--cpu-count**=*0* Limit the number of CPUs available for execution by the container. diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index 00085950b..5459bf51b 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -64,6 +64,9 @@ each of stdin, stdout, and stderr. **--cidfile**="" Write the container ID to the file +**--conmon-pidfile**="" + Write the pid of the `conmon` process to a file. `conmon` daemonizes separate from Podman, so this is necessary when using systemd to restart Podman containers. + **--cpu-period**=*0* Limit the CPU CFS (Completely Fair Scheduler) period |