containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #370 from rhatdan/crun 

Switch default runtime from runc to crun
This commit is contained in:
OpenShift Merge Robot 2020-12-04 16:31:22 -05:00 committed by GitHub
parent 16098c3cca 8618895ac3
commit a0ff81965b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/pkg/config/containers.conf
View File

@ -391,7 +391,7 @@ default_sysctls = [
# Default OCI runtime # Default OCI runtime
# #
# runtime = "runc" # runtime = "crun"
# List of the OCI runtimes that support --format=json. When json is supported # List of the OCI runtimes that support --format=json. When json is supported
# engine will use it for reporting nicer errors. # engine will use it for reporting nicer errors.

6
common/pkg/config/default.go
View File

@ -242,11 +242,7 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
c.ImageDefaultTransport = _defaultTransport c.ImageDefaultTransport = _defaultTransport
c.StateType = BoltDBStateStore c.StateType = BoltDBStateStore
c.OCIRuntime = "runc" c.OCIRuntime = "crun"
// If we're running on cgroupv2 v2, default to using crun.
if cgroup2, _ := cgroupv2.Enabled(); cgroup2 {
c.OCIRuntime = "crun"
}
c.ImageBuildFormat = "oci" c.ImageBuildFormat = "oci"
c.CgroupManager = defaultCgroupManager() c.CgroupManager = defaultCgroupManager()