From 241694402ffaa68e1232f92b7450b1228c412d6a Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Fri, 11 Nov 2016 09:01:57 -0800 Subject: [PATCH] Update docs for `docker info` for most recent changes. This fix updates docs for `docker info` for most recent changes. It also made several chagnes: 1. Replace 0.12.0-dev to 0.13.0 for api docs v1.24. 2. Replace 0.13.0-dev to 0.13.0 for api docs v1.25 Signed-off-by: Yong Tang --- docs/reference/commandline/info.md | 77 +++++++++++++++++++---------- man/docker-info.1.md | 79 ++++++++++++++++++++---------- 2 files changed, 102 insertions(+), 54 deletions(-) diff --git a/docs/reference/commandline/info.md b/docs/reference/commandline/info.md index 10f98e648e..70a5952e55 100644 --- a/docs/reference/commandline/info.md +++ b/docs/reference/commandline/info.md @@ -47,7 +47,7 @@ available on the volume where `/var/lib/docker` is mounted. ## Display Docker system information -Here is a sample output for a daemon running on Ubuntu, using the overlay +Here is a sample output for a daemon running on Ubuntu, using the overlay2 storage driver and a node that is part of a 2-node swarm: $ docker -D info @@ -56,49 +56,72 @@ storage driver and a node that is part of a 2-node swarm: Paused: 1 Stopped: 10 Images: 52 - Server Version: 1.12.0-dev - Storage Driver: overlay + Server Version: 1.13.0 + Storage Driver: overlay2 Backing Filesystem: extfs + Supports d_type: true + Native Overlay Diff: false Logging Driver: json-file Cgroup Driver: cgroupfs Plugins: Volume: local - Network: bridge null host overlay - Swarm: - NodeID: 0gac67oclbxq7 + Network: bridge host macvlan null overlay + Swarm: active + NodeID: rdjq45w1op418waxlairloqbm Is Manager: true - Managers: 2 + ClusterID: te8kdyw33n36fqiz74bfjeixd + Managers: 1 Nodes: 2 - Runtimes: default - Default Runtime: default - Security Options: apparmor seccomp - Kernel Version: 4.4.0-21-generic - Operating System: Ubuntu 16.04 LTS + Orchestration: + Task History Retention Limit: 5 + Raft: + Snapshot Interval: 10000 + Number of Old Snapshots to Retain: 0 + Heartbeat Tick: 1 + Election Tick: 3 + Dispatcher: + Heartbeat Period: 5 seconds + CA Configuration: + Expiry Duration: 3 months + Node Address: 172.16.66.128 172.16.66.129 + Manager Addresses: + 172.16.66.128:2477 + Runtimes: runc + Default Runtime: runc + Init Binary: docker-init + containerd version: 8517738ba4b82aff5662c97ca4627e7e4d03b531 + runc version: ac031b5bf1cc92239461125f4c1ffb760522bbf2 + init version: N/A (expected: v0.13.0) + Security Options: + apparmor + seccomp + Profile: default + Kernel Version: 4.4.0-31-generic + Operating System: Ubuntu 16.04.1 LTS OSType: linux Architecture: x86_64 - CPUs: 24 - Total Memory: 62.86 GiB - Name: docker - ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S + CPUs: 2 + Total Memory: 1.937 GiB + Name: ubuntu + ID: H52R:7ZR6:EIIA:76JG:ORIY:BVKF:GSFU:HNPG:B5MK:APSC:SZ3Q:N326 Docker Root Dir: /var/lib/docker - Debug mode (client): true - Debug mode (server): true - File Descriptors: 59 - Goroutines: 159 - System Time: 2016-04-26T10:04:06.14689342-04:00 + Debug Mode (client): true + Debug Mode (server): true + File Descriptors: 30 + Goroutines: 123 + System Time: 2016-11-12T17:24:37.955404361-08:00 EventsListeners: 0 - Http Proxy: http://test:test@localhost:8080 - Https Proxy: https://test:test@localhost:8080 + Http Proxy: http://proxy.example.com:80/ No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com - Username: svendowideit Registry: https://index.docker.io/v1/ WARNING: No swap limit support Labels: storage=ssd staging=true - Insecure registries: - myinsecurehost:5000 + Experimental: false + Insecure Registries: 127.0.0.0/8 + Live Restore Enabled: false The global `-D` option tells all `docker` commands to output debug information. @@ -168,7 +191,7 @@ Here is a sample output for a daemon running on Windows Server 2016: Paused: 0 Stopped: 1 Images: 17 - Server Version: 1.13.0-dev + Server Version: 1.13.0 Storage Driver: windowsfilter Windows: Logging Driver: json-file diff --git a/man/docker-info.1.md b/man/docker-info.1.md index 42f1efe863..5ac54848e4 100644 --- a/man/docker-info.1.md +++ b/man/docker-info.1.md @@ -39,7 +39,7 @@ available on the volume where `/var/lib/docker` is mounted. ## Display Docker system information -Here is a sample output for a daemon running on Ubuntu, using the overlay +Here is a sample output for a daemon running on Ubuntu, using the overlay2 storage driver: $ docker -D info @@ -48,49 +48,74 @@ storage driver: Paused: 1 Stopped: 10 Images: 52 - Server Version: 1.12.0-dev - Storage Driver: overlay + Server Version: 1.13.0 + Storage Driver: overlay2 Backing Filesystem: extfs + Supports d_type: true + Native Overlay Diff: false Logging Driver: json-file Cgroup Driver: cgroupfs Plugins: Volume: local - Network: bridge null host overlay - Swarm: - NodeID: 0gac67oclbxq7 - IsManager: YES - Managers: 2 + Network: bridge host macvlan null overlay + Swarm: active + NodeID: rdjq45w1op418waxlairloqbm + Is Manager: true + ClusterID: te8kdyw33n36fqiz74bfjeixd + Managers: 1 Nodes: 2 - Runtimes: default - Default Runtime: default - Security Options: apparmor seccomp - Kernel Version: 4.4.0-21-generic - Operating System: Ubuntu 16.04 LTS + Orchestration: + Task History Retention Limit: 5 + Raft: + Snapshot Interval: 10000 + Number of Old Snapshots to Retain: 0 + Heartbeat Tick: 1 + Election Tick: 3 + Dispatcher: + Heartbeat Period: 5 seconds + CA Configuration: + Expiry Duration: 3 months + Node Address: 172.16.66.128 172.16.66.129 + Manager Addresses: + 172.16.66.128:2477 + Runtimes: runc + Default Runtime: runc + Init Binary: docker-init + containerd version: 8517738ba4b82aff5662c97ca4627e7e4d03b531 + runc version: ac031b5bf1cc92239461125f4c1ffb760522bbf2 + init version: N/A (expected: v0.13.0) + Security Options: + apparmor + seccomp + Profile: default + Kernel Version: 4.4.0-31-generic + Operating System: Ubuntu 16.04.1 LTS OSType: linux Architecture: x86_64 - CPUs: 24 - Total Memory: 62.86 GiB - Name: docker - ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S + CPUs: 2 + Total Memory: 1.937 GiB + Name: ubuntu + ID: H52R:7ZR6:EIIA:76JG:ORIY:BVKF:GSFU:HNPG:B5MK:APSC:SZ3Q:N326 Docker Root Dir: /var/lib/docker - Debug mode (client): true - Debug mode (server): true - File Descriptors: 59 - Goroutines: 159 - System Time: 2016-04-26T10:04:06.14689342-04:00 + Debug Mode (client): true + Debug Mode (server): true + File Descriptors: 30 + Goroutines: 123 + System Time: 2016-11-12T17:24:37.955404361-08:00 EventsListeners: 0 - Http Proxy: http://test:test@localhost:8080 - Https Proxy: https://test:test@localhost:8080 + Http Proxy: http://proxy.example.com:80/ No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com - Username: svendowideit Registry: https://index.docker.io/v1/ WARNING: No swap limit support Labels: storage=ssd staging=true - Insecure registries: - myinsecurehost:5000 + Experimental: false + Insecure Registries: 127.0.0.0/8 + Live Restore Enabled: false + + The global `-D` option tells all `docker` commands to output debug information.