rootless: update `docker info` docs
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
parent
153466ba0a
commit
ca5aab19b4
|
@ -3818,7 +3818,7 @@ definitions:
|
||||||
description: |
|
description: |
|
||||||
The driver to use for managing cgroups.
|
The driver to use for managing cgroups.
|
||||||
type: "string"
|
type: "string"
|
||||||
enum: ["cgroupfs", "systemd"]
|
enum: ["cgroupfs", "systemd", "none"]
|
||||||
default: "cgroupfs"
|
default: "cgroupfs"
|
||||||
example: "cgroupfs"
|
example: "cgroupfs"
|
||||||
NEventsListener:
|
NEventsListener:
|
||||||
|
@ -4053,7 +4053,7 @@ definitions:
|
||||||
SecurityOptions:
|
SecurityOptions:
|
||||||
description: |
|
description: |
|
||||||
List of security features that are enabled on the daemon, such as
|
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
|
Additional configuration options for each security feature may
|
||||||
be present, and are included as a comma-separated list of key/value
|
be present, and are included as a comma-separated list of key/value
|
||||||
|
@ -4066,6 +4066,7 @@ definitions:
|
||||||
- "name=seccomp,profile=default"
|
- "name=seccomp,profile=default"
|
||||||
- "name=selinux"
|
- "name=selinux"
|
||||||
- "name=userns"
|
- "name=userns"
|
||||||
|
- "name=rootless"
|
||||||
ProductLicense:
|
ProductLicense:
|
||||||
description: |
|
description: |
|
||||||
Reports a summary of the product license on the daemon.
|
Reports a summary of the product license on the daemon.
|
||||||
|
|
|
@ -22,7 +22,11 @@ keywords: "API, Docker, rcli, REST, documentation"
|
||||||
`private` to create the container in its own private cgroup namespace. The per-daemon
|
`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
|
default is `host`, and can be changed by using the`CgroupNamespaceMode` daemon configuration
|
||||||
parameter.
|
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
|
## v1.40 API changes
|
||||||
|
|
||||||
|
|
|
@ -64,6 +64,8 @@ Remarks:
|
||||||
* The exec dir is set to `$XDG_RUNTIME_DIR/docker` by default.
|
* 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 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)`.
|
* 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
|
### Client
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue