diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-22 17:00:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 17:00:48 +0100 |
| commit | 9f146b1b54736ec1b683e3a7381c85d10b1a66a3 (patch) | |
| tree | dd2ff39128e9aa3ba5bf67c7abc69aa59020f6b7 /libpod/container.go | |
| parent | 105a42a2a46529312205cf852fa127627f8915e3 (diff) | |
| parent | 1951ff168a63157fa2f4711fde283edfc4981ed3 (diff) | |
| download | podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.tar.gz podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.tar.bz2 podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.zip | |
Merge pull request #4861 from giuseppe/add-cgroups-disabled-conmon
oci_conmon: do not create a cgroup under systemd
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 |