|
@@ -73,6 +73,7 @@ const (
|
|
// constant for cgroup drivers
|
|
// constant for cgroup drivers
|
|
cgroupFsDriver = "cgroupfs"
|
|
cgroupFsDriver = "cgroupfs"
|
|
cgroupSystemdDriver = "systemd"
|
|
cgroupSystemdDriver = "systemd"
|
|
|
|
+ cgroupNoneDriver = "none"
|
|
|
|
|
|
// DefaultRuntimeName is the default runtime to be used by
|
|
// DefaultRuntimeName is the default runtime to be used by
|
|
// containerd if none is specified
|
|
// containerd if none is specified
|
|
@@ -575,6 +576,9 @@ func verifyPlatformContainerResources(resources *containertypes.Resources, sysIn
|
|
}
|
|
}
|
|
|
|
|
|
func (daemon *Daemon) getCgroupDriver() string {
|
|
func (daemon *Daemon) getCgroupDriver() string {
|
|
|
|
+ if daemon.Rootless() {
|
|
|
|
+ return cgroupNoneDriver
|
|
|
|
+ }
|
|
cgroupDriver := cgroupFsDriver
|
|
cgroupDriver := cgroupFsDriver
|
|
|
|
|
|
if UsingSystemd(daemon.configStore) {
|
|
if UsingSystemd(daemon.configStore) {
|
|
@@ -601,6 +605,9 @@ func VerifyCgroupDriver(config *config.Config) error {
|
|
if cd == "" || cd == cgroupFsDriver || cd == cgroupSystemdDriver {
|
|
if cd == "" || cd == cgroupFsDriver || cd == cgroupSystemdDriver {
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
+ if cd == cgroupNoneDriver {
|
|
|
|
+ return fmt.Errorf("native.cgroupdriver option %s is internally used and cannot be specified manually", cd)
|
|
|
|
+ }
|
|
return fmt.Errorf("native.cgroupdriver option %s not supported", cd)
|
|
return fmt.Errorf("native.cgroupdriver option %s not supported", cd)
|
|
}
|
|
}
|
|
|
|
|