mirror of
https://github.com/containers/podman.git
synced 2025-09-28 09:15:26 +08:00
Update buildah to v1.11.0
Vendor in the latest changes for buildah to apply the implemented features here as well. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
This commit is contained in:
7
vendor/github.com/containers/buildah/util/util.go
generated
vendored
7
vendor/github.com/containers/buildah/util/util.go
generated
vendored
@ -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
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user