summaryrefslogtreecommitdiff
path: root/vendor/github.com/containers/buildah/util/util.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/containers/buildah/util/util.go')
-rw-r--r--vendor/github.com/containers/buildah/util/util.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/vendor/github.com/containers/buildah/util/util.go b/vendor/github.com/containers/buildah/util/util.go
index bea54b7ad..4be0b2de8 100644
--- a/vendor/github.com/containers/buildah/util/util.go
+++ b/vendor/github.com/containers/buildah/util/util.go
@@ -9,6 +9,7 @@ import (
"strings"
"syscall"
+ "github.com/containers/buildah/pkg/cgroups"
"github.com/containers/image/docker/reference"
"github.com/containers/image/pkg/sysregistriesv2"
"github.com/containers/image/signature"
@@ -249,6 +250,12 @@ func Runtime() string {
if runtime != "" {
return runtime
}
+
+ // Need to switch default until runc supports cgroups v2
+ if unified, _ := cgroups.IsCgroup2UnifiedMode(); unified {
+ return "crun"
+ }
+
return DefaultRuntime
}