Merge pull request #127 from giuseppe/fix-cgroup-default

config: default to cgroupns="host" on cgroup v1
This commit is contained in:
Daniel J Walsh 2020-04-23 09:57:05 -04:00 committed by GitHub
commit ea7d7afb90
1 changed files with 6 additions and 1 deletions

View File

@ -141,13 +141,18 @@ func DefaultConfig() (*Config, error) {
netns = "slirp4netns"
}
cgroupNS := "host"
if cgroup2, _ := cgroupv2.Enabled(); cgroup2 {
cgroupNS = "private"
}
return &Config{
Containers: ContainersConfig{
Devices: []string{},
Volumes: []string{},
Annotations: []string{},
ApparmorProfile: DefaultApparmorProfile,
CgroupNS: "private",
CgroupNS: cgroupNS,
Cgroups: "enabled",
DefaultCapabilities: DefaultCapabilities,
DefaultSysctls: []string{},