opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 03:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4861 from giuseppe/add-cgroups-disabled-conmon

Browse Source 
oci_conmon: do not create a cgroup under systemd
This commit is contained in:
OpenShift Merge Robot
2020-01-22 17:00:48 +01:00
committed by GitHub
parent 105a42a2a4 1951ff168a
commit 9f146b1b54
10 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/source/markdown/podman-create.1.md
View File

@ -78,8 +78,9 @@ If the host uses cgroups v1, the default is set to **host**. On cgroups v2 the
**--cgroups**=*mode*
Determines whether the container will create CGroups.
Valid values are *enabled* and *disabled*, which the default being *enabled*.
Valid values are *enabled*, *disabled*, *no-conmon*, which the default being *enabled*.
The *disabled* option will force the container to not create CGroups, and thus conflicts with CGroup options (**--cgroupns** and **--cgroup-parent**).
The *no-conmon* option disables a new CGroup only for the conmon process.
**--cgroup-parent**=*path*

3
docs/source/markdown/podman-run.1.md
View File

@ -92,8 +92,9 @@ If the host uses cgroups v1, the default is set to **host**. On cgroups v2 the
**--cgroups**=*mode*
Determines whether the container will create CGroups.
Valid values are *enabled* and *disabled*, which the default being *enabled*.
Valid values are *enabled*, *disabled*, *no-conmon*, which the default being *enabled*.
The *disabled* option will force the container to not create CGroups, and thus conflicts with CGroup options (**--cgroupns** and **--cgroup-parent**).
The *no-conmon* option disables a new CGroup only for the conmon process.
**--cgroup-parent**=*cgroup*