summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomSweeneyRedHat <tsweeney@redhat.com>2019-05-08 11:42:37 -0400
committerTomSweeneyRedHat <tsweeney@redhat.com>2019-05-16 10:16:20 -0400
commit43e5ac3577cdbafb56298c045d6c8454d0cfe175 (patch)
tree7ed6c77b05b06509397dbdf35b1f990c9b757a3d
parent2bb1487a00d23bb38314b7d7ee861952b7c6517e (diff)
downloadpodman-43e5ac3577cdbafb56298c045d6c8454d0cfe175.tar.gz
podman-43e5ac3577cdbafb56298c045d6c8454d0cfe175.tar.bz2
podman-43e5ac3577cdbafb56298c045d6c8454d0cfe175.zip
Touchup run man page
Moves --help and combines the duplicate sections of help for uts and userns. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
-rw-r--r--docs/podman-run.1.md26
1 files changed, 6 insertions, 20 deletions
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index 1840e0f0b..210ed4f8a 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -291,16 +291,16 @@ The initialization time needed for a container to bootstrap. The value can be ex
The maximum time allowed to complete the healthcheck before an interval is considered failed. Like start-period, the
value can be expressed in a time format such as `1m22s`. The default value is `30s`.
+**--help**
+
+Print usage statement
+
**--hostname**=""
Container host name
Sets the container host name that is available inside the container.
-**--help**
-
-Print usage statement
-
**--http-proxy**=*true*|*false*
By default proxy environment variables are passed into the container if set
@@ -769,25 +769,11 @@ This option is incompatible with --gidmap, --uidmap, --subuid and --subgid
Set the UTS mode for the container
-`host`: use the host's UTS namespace inside the container.
-`ns`: specify the user namespace to use.
+- `host`: use the host's UTS namespace inside the container.
+- `ns`: specify the user namespace to use.
**NOTE**: the host mode gives the container access to changing the host's hostname and is therefore considered insecure.
-**--userns**=""
-
-Set the user namespace mode for the container. The use of userns is disabled by default.
-
- **host**: use the host user namespace and enable all privileged options (e.g., `pid=host` or `--privileged`).
- **ns**: specify the user namespace to use.
-
-**--uts**=*host*
-
-Set the UTS mode for the container
- **host**: use the host's UTS namespace inside the container.
- **ns**: specify the user namespace to use.
- Note: the host mode gives the container access to changing the host's hostname and is therefore considered insecure.
-
**--volume**, **-v**[=*[HOST-DIR:CONTAINER-DIR[:OPTIONS]]*]
Create a bind mount. If you specify, ` -v /HOST-DIR:/CONTAINER-DIR`, podman