summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-18 16:14:52 +0200
committerGitHub <noreply@github.com>2019-07-18 16:14:52 +0200
commitade0d8778f39b854fed3523bc17afbd98cc5a886 (patch)
treea6c7a77c97620a8585016ed28ddbfada4029b584 /docs
parent22e62e8691495dd5385e23e51901b357e2891a74 (diff)
parent0b57e77d7c1c54706611c9ca15e352425adb05e5 (diff)
downloadpodman-ade0d8778f39b854fed3523bc17afbd98cc5a886.tar.gz
podman-ade0d8778f39b854fed3523bc17afbd98cc5a886.tar.bz2
podman-ade0d8778f39b854fed3523bc17afbd98cc5a886.zip
Merge pull request #3509 from giuseppe/cgroup-namespace
libpod: support for cgroup namespace
Diffstat (limited to 'docs')
-rw-r--r--docs/podman-create.1.md8
-rw-r--r--docs/podman-run.1.md8
2 files changed, 16 insertions, 0 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
index 89f146670..24a78ab93 100644
--- a/docs/podman-create.1.md
+++ b/docs/podman-create.1.md
@@ -63,6 +63,14 @@ Add Linux capabilities
Drop Linux capabilities
+**--cgroupns**=*mode*
+
+Set the cgroup namespace mode for the container, by default **host** is used.
+ **host**: use the host's cgroup namespace inside the container.
+ **container:<NAME|ID>**: join the namespace of the specified container.
+ **private**: create a new cgroup namespace.
+ **ns:<PATH>**: join the namespace at the specified path.
+
**--cgroup-parent**=*path*
Path to cgroups under which the cgroup for the container will be created. If the path is not absolute, the path is considered to be relative to the cgroups path of the init process. Cgroups will be created if they do not already exist.
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index ebf774b24..6315afea6 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -77,6 +77,14 @@ Add Linux capabilities
Drop Linux capabilities
+**--cgroupns**=*mode*
+
+Set the cgroup namespace mode for the container, by default **host** is used.
+ **host**: use the host's cgroup namespace inside the container.
+ **container:<NAME|ID>**: join the namespace of the specified container.
+ **private**: create a new cgroup namespace.
+ **ns:<PATH>**: join the namespace at the specified path.
+
**--cgroup-parent**=*cgroup*
Path to cgroups under which the cgroup for the container will be created. If the path is not absolute, the path is considered to be relative to the cgroups path of the init process. Cgroups will be created if they do not already exist.