From ca5aab19b482f27629374cdde4df26b5676e39cb Mon Sep 17 00:00:00 2001
From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date: Mon, 3 Jun 2019 19:41:50 +0900
Subject: [PATCH] rootless: update `docker info` docs

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
---
 api/swagger.yaml            | 5 +++--
 docs/api/version-history.md | 6 +++++-
 docs/rootless.md            | 2 ++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/api/swagger.yaml b/api/swagger.yaml
index c85c4ba9d0..44e8ea1553 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/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