diff --git a/api/swagger.yaml b/api/swagger.yaml index 53dc59b3af..7b48c0f798 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -3818,7 +3818,7 @@ definitions: description: | The driver to use for managing cgroups. type: "string" - enum: ["cgroupfs", "systemd"] + enum: ["cgroupfs", "systemd", "none"] default: "cgroupfs" example: "cgroupfs" NEventsListener: @@ -4053,7 +4053,7 @@ definitions: SecurityOptions: description: | List of security features that are enabled on the daemon, such as - apparmor, seccomp, SELinux, and user-namespaces (userns). + apparmor, seccomp, SELinux, user-namespaces (userns), and rootless. Additional configuration options for each security feature may be present, and are included as a comma-separated list of key/value @@ -4066,6 +4066,7 @@ definitions: - "name=seccomp,profile=default" - "name=selinux" - "name=userns" + - "name=rootless" ProductLicense: description: | Reports a summary of the product license on the daemon. diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index cc4cdd4940..32009d44f4 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -73,6 +73,7 @@ const ( // constant for cgroup drivers cgroupFsDriver = "cgroupfs" cgroupSystemdDriver = "systemd" + cgroupNoneDriver = "none" // DefaultRuntimeName is the default runtime to be used by // containerd if none is specified @@ -584,6 +585,9 @@ func verifyPlatformContainerResources(resources *containertypes.Resources, sysIn } func (daemon *Daemon) getCgroupDriver() string { + if daemon.Rootless() { + return cgroupNoneDriver + } cgroupDriver := cgroupFsDriver if UsingSystemd(daemon.configStore) { @@ -610,6 +614,9 @@ func VerifyCgroupDriver(config *config.Config) error { if cd == "" || cd == cgroupFsDriver || cd == cgroupSystemdDriver { 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) } diff --git a/docs/api/version-history.md b/docs/api/version-history.md index c252d8170e..c73e772975 100644 --- a/docs/api/version-history.md +++ b/docs/api/version-history.md @@ -22,7 +22,11 @@ keywords: "API, Docker, rcli, REST, documentation" `private` to create the container in its own private cgroup namespace. The per-daemon default is `host`, and can be changed by using the`CgroupNamespaceMode` daemon configuration parameter. - +* `GET /info` now includes `name=rootless` in `SecurityOptions` when the daemon is running in + rootless mode. This change is not versioned, and affects all API versions if the daemon has + this patch. +* `GET /info` now returns `none` as `CgroupDriver` when the daemon is running in rootless mode. + This change is not versioned, and affects all API versions if the daemon has this patch. ## v1.40 API changes diff --git a/docs/rootless.md b/docs/rootless.md index 9cf6dd7def..f8e27a2c6d 100644 --- a/docs/rootless.md +++ b/docs/rootless.md @@ -64,6 +64,8 @@ Remarks: * The exec dir is set to `$XDG_RUNTIME_DIR/docker` by default. * The daemon config dir is set to `~/.config/docker` (not `~/.docker`, which is used by the client) by default. * The `dockerd-rootless.sh` script executes `dockerd` in its own user, mount, and network namespaces. You can enter the namespaces by running `nsenter -U --preserve-credentials -n -m -t $(cat $XDG_RUNTIME_DIR/docker.pid)`. +* `docker info` shows `rootless` in `SecurityOptions` +* `docker info` shows `none` as `Cgroup Driver` ### Client