diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-24 14:52:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 14:52:21 +0200 |
| commit | ec17b2652ea758a58a49ccbb1074d0fb6b6a703c (patch) | |
| tree | a540b1b00e6e17abbad8910696388a13df690cbe /vendor | |
| parent | 2c457a632c73cad3acfd5946633e67ef26211b34 (diff) | |
| parent | f0ebde8254929edff0191746744334baf5f9aec6 (diff) | |
| download | podman-ec17b2652ea758a58a49ccbb1074d0fb6b6a703c.tar.gz podman-ec17b2652ea758a58a49ccbb1074d0fb6b6a703c.tar.bz2 podman-ec17b2652ea758a58a49ccbb1074d0fb6b6a703c.zip | |
Merge pull request #5965 from containers/dependabot/go_modules/github.com/containers/common-0.9.5
Bump github.com/containers/common from 0.9.4 to 0.9.5
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/common/pkg/config/default.go | 7 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go index d0f8649c5..446382ac7 100644 --- a/vendor/github.com/containers/common/pkg/config/default.go +++ b/vendor/github.com/containers/common/pkg/config/default.go @@ -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{}, diff --git a/vendor/modules.txt b/vendor/modules.txt index ba7990fb7..782a905a1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -82,7 +82,7 @@ github.com/containers/buildah/pkg/secrets github.com/containers/buildah/pkg/supplemented github.com/containers/buildah/pkg/umask github.com/containers/buildah/util -# github.com/containers/common v0.9.4 +# github.com/containers/common v0.9.5 github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/auth github.com/containers/common/pkg/capabilities |