diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-03-16 10:34:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-16 10:34:32 -0400 |
| commit | d7acfb478e5e5e6ac344d18c1a65ab81996fd8b2 (patch) | |
| tree | c1a335e5a2291e8447e8f9f4c4ef02e7cde2fd0c /docs | |
| parent | 2f533888a5adcbfb57ec22a8086aa5e76acb9071 (diff) | |
| parent | cd73a6904d3dc91f305c7415ab7bada8a976d815 (diff) | |
| download | podman-d7acfb478e5e5e6ac344d18c1a65ab81996fd8b2.tar.gz podman-d7acfb478e5e5e6ac344d18c1a65ab81996fd8b2.tar.bz2 podman-d7acfb478e5e5e6ac344d18c1a65ab81996fd8b2.zip | |
Merge pull request #447 from mheon/sig_proxy
Add signal proxying to podman run and attach
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/podman-attach.1.md | 3 | ||||
| -rw-r--r-- | docs/podman-create.1.md | 3 | ||||
| -rw-r--r-- | docs/podman-start.1.md | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/docs/podman-attach.1.md b/docs/podman-attach.1.md index 64163b340..a1c058022 100644 --- a/docs/podman-attach.1.md +++ b/docs/podman-attach.1.md @@ -27,6 +27,9 @@ to run containers such as CRI-O, the last started container could be from either **--no-stdin** Do not attach STDIN. The default is false. +**--sig-proxy**=*true*|*false* +Proxy received signals to the process (non-TTY mode only). SIGCHLD, SIGSTOP, and SIGKILL are not proxied. The default is *true*. + ## EXAMPLES ## ``` diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 044ab23d3..b28b785f1 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -419,9 +419,6 @@ its root filesystem mounted as read only prohibiting any writes. Unit is optional and can be `b` (bytes), `k` (kilobytes), `m`(megabytes), or `g` (gigabytes). If you omit the unit, the system uses bytes. If you omit the size entirely, the system uses `64m`. -**--sig-proxy**=*true*|*false* - Proxy received signals to the process (non-TTY mode only). SIGCHLD, SIGSTOP, and SIGKILL are not proxied. The default is *true*. - **--stop-signal**=*SIGTERM* Signal to stop a container. Default is SIGTERM. diff --git a/docs/podman-start.1.md b/docs/podman-start.1.md index 492787e6c..24fc49a8e 100644 --- a/docs/podman-start.1.md +++ b/docs/podman-start.1.md @@ -33,6 +33,9 @@ Attach container's STDIN. The default is false. Instead of providing the container name or ID, use the last created container. If you use methods other than Podman to run containers such as CRI-O, the last started container could be from either of those methods. +**--sig-proxy**=*true*|*false* +Proxy received signals to the process (non-TTY mode only). SIGCHLD, SIGSTOP, and SIGKILL are not proxied. The default is false. + ## EXAMPLE podman start mywebserver |