Merge pull request #370 from rhatdan/crun

Switch default runtime from runc to crun

common/pkg/config/containers.conf

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

common/pkg/config/default.go

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