summaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authordependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>2020-07-23 08:58:50 +0000
committerDaniel J Walsh <dwalsh@redhat.com>2020-07-23 05:05:26 -0400
commit87f60bbfaab89cddd8c44b1b3b4c3ee8c4d33ced (patch)
tree16d0d5ea81e9e98df138892d681b94203d52fea2 /vendor/github.com
parent1aac197f79e91b06ec7e948bd73bb2464e8a508f (diff)
downloadpodman-87f60bbfaab89cddd8c44b1b3b4c3ee8c4d33ced.tar.gz
podman-87f60bbfaab89cddd8c44b1b3b4c3ee8c4d33ced.tar.bz2
podman-87f60bbfaab89cddd8c44b1b3b4c3ee8c4d33ced.zip
Bump github.com/containers/common from 0.17.0 to 0.18.0
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.17.0 to 0.18.0. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.17.0...v0.18.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/containers/common/pkg/config/systemd.go10
-rw-r--r--vendor/github.com/containers/common/version/version.go2
2 files changed, 11 insertions, 1 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"