diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-23 19:42:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-23 19:42:54 +0200 |
| commit | 961fa6a6082990276300aaf39834da13183bb88e (patch) | |
| tree | e11f9909975cb8cd99f0081d24d6e666e0d667cb /vendor | |
| parent | 5b67f8108a5082f225d1e7e52c0e42bc68b87d48 (diff) | |
| parent | 87f60bbfaab89cddd8c44b1b3b4c3ee8c4d33ced (diff) | |
| download | podman-961fa6a6082990276300aaf39834da13183bb88e.tar.gz podman-961fa6a6082990276300aaf39834da13183bb88e.tar.bz2 podman-961fa6a6082990276300aaf39834da13183bb88e.zip | |
Merge pull request #7063 from containers/dependabot/go_modules/github.com/containers/common-0.17.1
Bump github.com/containers/common from 0.17.0 to 0.17.1
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/github.com/containers/common/pkg/config/systemd.go | 10 | ||||
| -rw-r--r-- | vendor/github.com/containers/common/version/version.go | 2 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/systemd.go b/vendor/github.com/containers/common/pkg/config/systemd.go index e02f52192..02e5c4ac2 100644 --- a/vendor/github.com/containers/common/pkg/config/systemd.go +++ b/vendor/github.com/containers/common/pkg/config/systemd.go @@ -2,7 +2,17 @@ package config +import ( + "github.com/containers/common/pkg/cgroupv2" + "github.com/containers/storage/pkg/unshare" +) + func defaultCgroupManager() string { + enabled, err := cgroupv2.Enabled() + if err == nil && !enabled && unshare.IsRootless() { + return CgroupfsCgroupsManager + } + return SystemdCgroupsManager } func defaultEventsLogger() string { diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/github.com/containers/common/version/version.go index 2913fe974..6b226eabe 100644 --- a/vendor/github.com/containers/common/version/version.go +++ b/vendor/github.com/containers/common/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.17.0" +const Version = "0.18.0" diff --git a/vendor/modules.txt b/vendor/modules.txt index 1d97f810a..7cd0f86df 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -84,7 +84,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.17.0 +# github.com/containers/common v0.18.0 github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/auth github.com/containers/common/pkg/capabilities |