aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-11 21:35:37 +0200
committerGitHub <noreply@github.com>2019-07-11 21:35:37 +0200
commit2b64f8844655b7188332a404ec85d32c33feb9e9 (patch)
treeafcbaa55ba396ac68ebdc87ad15f1554e6ee1e5d /docs
parent24409daa36137406a403ae8e22cf71afa590c746 (diff)
parentfb88074e68db25474290535e8a778e39434cc2a2 (diff)
downloadpodman-2b64f8844655b7188332a404ec85d32c33feb9e9.tar.gz
podman-2b64f8844655b7188332a404ec85d32c33feb9e9.tar.bz2
podman-2b64f8844655b7188332a404ec85d32c33feb9e9.zip
Merge pull request #3491 from giuseppe/rlimit-host
podman: add --ulimit host
Diffstat (limited to 'docs')
-rw-r--r--docs/podman-create.1.md2
-rw-r--r--docs/podman-run.1.md2
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
index 9cf3e038d..a34111a03 100644
--- a/docs/podman-create.1.md
+++ b/docs/podman-create.1.md
@@ -723,6 +723,8 @@ The following example maps uids 0-2000 in the container to the uids 30000-31999
Ulimit options
+You can pass `host` to copy the current configuration from the host.
+
**--user**, **-u**=*user*
Sets the username or UID used and optionally the groupname or GID for the specified command.
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index 4889e5755..86cc2125c 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -759,6 +759,8 @@ The example maps uids 0-2000 in the container to the uids 30000-31999 on the hos
Ulimit options
+You can pass `host` to copy the current configuration from the host.
+
**--user**, **-u**=*user*
Sets the username or UID used and optionally the groupname or GID for the specified command.