diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-01-14 15:05:12 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-01-16 18:56:51 +0100 |
| commit | ba0a6f34e349bfb5cf70cb2062522e6af1b9578c (patch) | |
| tree | b74d4b895ac5b39d4b1f6448aab2fd8c7ac7dbcc /libpod/container.go | |
| parent | 30245affe9881fdedc869ccb68faa3e2f5fb9366 (diff) | |
| download | podman-ba0a6f34e349bfb5cf70cb2062522e6af1b9578c.tar.gz podman-ba0a6f34e349bfb5cf70cb2062522e6af1b9578c.tar.bz2 podman-ba0a6f34e349bfb5cf70cb2062522e6af1b9578c.zip | |
podman: add new option --cgroups=no-conmon
it allows to disable cgroups creation only for the conmon process.
A new cgroup is created for the container payload.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libpod/container.go')
| -rw-r--r-- | libpod/container.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpod/container.go b/libpod/container.go index b3cb6334a..f29cebf20 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -373,8 +373,11 @@ type ContainerConfig struct { // Time container was created CreatedTime time.Time `json:"createdTime"` // NoCgroups indicates that the container will not create CGroups. It is - // incompatible with CgroupParent. + // incompatible with CgroupParent. Deprecated in favor of CgroupsMode. NoCgroups bool `json:"noCgroups,omitempty"` + // CgroupsMode indicates how the container will create cgroups + // (disabled, no-conmon, enabled). It supersedes NoCgroups. + CgroupsMode string `json:"cgroupsMode,omitempty"` // Cgroup parent of the container CgroupParent string `json:"cgroupParent"` // LogPath log location |