diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-27 16:47:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 16:47:32 -0400 |
| commit | f613a2a8d5778cf088f4d18b69c86b082264a882 (patch) | |
| tree | bf07f589419a0d25d23125eaeb27f04103b49ca1 /docs | |
| parent | dbc13f3dac4fa4095ae5db86085e5711a701eb7b (diff) | |
| parent | 3538815c5b2b4c97304e3ea940cee414b0004d2f (diff) | |
| download | podman-f613a2a8d5778cf088f4d18b69c86b082264a882.tar.gz podman-f613a2a8d5778cf088f4d18b69c86b082264a882.tar.bz2 podman-f613a2a8d5778cf088f4d18b69c86b082264a882.zip | |
Merge pull request #10119 from rhatdan/timeout
Add podman run --timeout option
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/markdown/podman-create.1.md | 6 | ||||
| -rw-r--r-- | docs/source/markdown/podman-run.1.md | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md index 229bb82f5..482509e01 100644 --- a/docs/source/markdown/podman-create.1.md +++ b/docs/source/markdown/podman-create.1.md @@ -951,6 +951,12 @@ The `container_manage_cgroup` boolean must be enabled for this to be allowed on `setsebool -P container_manage_cgroup true` +#### **\-\-timeout**=*seconds* + +Maximimum time a container is allowed to run before conmon sends it the kill +signal. By default containers will run until they exit or are stopped by +`podman stop`. + #### **\-\-tmpfs**=*fs* Create a tmpfs mount diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md index 2e6d97a05..0d1771cd4 100644 --- a/docs/source/markdown/podman-run.1.md +++ b/docs/source/markdown/podman-run.1.md @@ -1024,6 +1024,12 @@ The **container_manage_cgroup** boolean must be enabled for this to be allowed o setsebool -P container_manage_cgroup true ``` +#### **\-\-timeout**=*seconds* + +Maximimum time a container is allowed to run before conmon sends it the kill +signal. By default containers will run until they exit or are stopped by +`podman stop`. + #### **\-\-tmpfs**=*fs* Create a tmpfs mount. |