diff options
| author | dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> | 2020-04-24 09:00:10 +0000 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-24 06:43:30 -0400 |
| commit | f0ebde8254929edff0191746744334baf5f9aec6 (patch) | |
| tree | 69eee9096a800ae3b898f5872dd9aeac077abcb3 /vendor | |
| parent | 81c7a2444cb5cbf8b8911cdb59446a239f89168c (diff) | |
| download | podman-f0ebde8254929edff0191746744334baf5f9aec6.tar.gz podman-f0ebde8254929edff0191746744334baf5f9aec6.tar.bz2 podman-f0ebde8254929edff0191746744334baf5f9aec6.zip | |
Bump github.com/containers/common from 0.9.4 to 0.9.5
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.9.4 to 0.9.5.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.9.4...v0.9.5)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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 |