diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-08 18:08:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 18:08:17 -0400 |
| commit | e9961e053cab35abffc575fb9cbd6e7c4e79a324 (patch) | |
| tree | 8e03e7233a4bfb8f69577c34fb8cd8d6ac9fc3ae /libpod/container_config.go | |
| parent | c61faacc78e916fdfa9f53bb543514e11138903c (diff) | |
| parent | 4d800a5f45abba9c17d4b3a4c04af563c9a2f4da (diff) | |
| download | podman-e9961e053cab35abffc575fb9cbd6e7c4e79a324.tar.gz podman-e9961e053cab35abffc575fb9cbd6e7c4e79a324.tar.bz2 podman-e9961e053cab35abffc575fb9cbd6e7c4e79a324.zip | |
Merge pull request #7970 from mheon/fix_7830
Store cgroup manager on a per-container basis
Diffstat (limited to 'libpod/container_config.go')
| -rw-r--r-- | libpod/container_config.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpod/container_config.go b/libpod/container_config.go index fc93140dd..e264da4da 100644 --- a/libpod/container_config.go +++ b/libpod/container_config.go @@ -275,13 +275,16 @@ type ContainerMiscConfig struct { StopTimeout uint `json:"stopTimeout,omitempty"` // Time container was created CreatedTime time.Time `json:"createdTime"` + // CgroupManager is the cgroup manager used to create this container. + // If empty, the runtime default will be used. + CgroupManager string `json:"cgroupManager,omitempty"` // NoCgroups indicates that the container will not create CGroups. It is // 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 + // Cgroup parent of the container. CgroupParent string `json:"cgroupParent"` // LogPath log location LogPath string `json:"logPath"` |