kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Update docs for docker info for most recent changes.

Browse source 
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 <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2016-11-11 09:01:57 -08:00 • committed by Victor Vieux
parent dbf1900e8c
commit 7154093e59
4 changed files with 110 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/reference/api/docker_remote_api_v1.24.md
View file

@ -2459,7 +2459,7 @@ Docker daemon report the following event:
HTTP/1.1 200 OK HTTP/1.1 200 OK
Content-Type: application/json Content-Type: application/json
Server: Docker/1.11.0 (linux) Server: Docker/1.12.0 (linux)
Date: Fri, 29 Apr 2016 15:18:06 GMT Date: Fri, 29 Apr 2016 15:18:06 GMT
Transfer-Encoding: chunked Transfer-Encoding: chunked
@ -3912,7 +3912,7 @@ List nodes
"MemoryBytes": 8272408576 "MemoryBytes": 8272408576
}, },
"Engine": { "Engine": {
"EngineVersion": "1.12.0-dev", "EngineVersion": "1.12.0",
"Labels": { "Labels": {
"foo": "bar", "foo": "bar",
} }
@ -4004,7 +4004,7 @@ Return low-level information on the node `id`
"MemoryBytes": 8272408576 "MemoryBytes": 8272408576
}, },
"Engine": { "Engine": {
"EngineVersion": "1.12.0-dev", "EngineVersion": "1.12.0",
"Labels": { "Labels": {
"foo": "bar", "foo": "bar",
} }

10
docs/reference/api/docker_remote_api_v1.25.md
View file

@ -2610,7 +2610,7 @@ Display system-wide information
"Name": "WIN-V0V70C0LU5P", "Name": "WIN-V0V70C0LU5P",
"Labels": null, "Labels": null,
"ExperimentalBuild": false, "ExperimentalBuild": false,
"ServerVersion": "1.13.0-dev", "ServerVersion": "1.13.0",
"ClusterStore": "", "ClusterStore": "",
"ClusterAdvertise": "", "ClusterAdvertise": "",
"SecurityOptions": null, "SecurityOptions": null,
@ -2904,7 +2904,7 @@ Docker daemon report the following event:
HTTP/1.1 200 OK HTTP/1.1 200 OK
Content-Type: application/json Content-Type: application/json
Server: Docker/1.11.0 (linux) Server: Docker/1.13.0 (linux)
Date: Fri, 29 Apr 2016 15:18:06 GMT Date: Fri, 29 Apr 2016 15:18:06 GMT
Transfer-Encoding: chunked Transfer-Encoding: chunked
@ -4510,7 +4510,7 @@ List nodes
"MemoryBytes": 8272408576 "MemoryBytes": 8272408576
}, },
"Engine": { "Engine": {
"EngineVersion": "1.12.0-dev", "EngineVersion": "1.13.0",
"Labels": { "Labels": {
"foo": "bar", "foo": "bar",
} }
@ -4603,7 +4603,7 @@ Return low-level information on the node `id`
"MemoryBytes": 8272408576 "MemoryBytes": 8272408576
}, },
"Engine": { "Engine": {
"EngineVersion": "1.12.0-dev", "EngineVersion": "1.13.0",
"Labels": { "Labels": {
"foo": "bar", "foo": "bar",
} }
@ -4813,7 +4813,7 @@ Initialize a new swarm. The body of the HTTP response includes the node ID.
Content-Length: 28 Content-Length: 28
Content-Type: application/json Content-Type: application/json
Date: Thu, 01 Sep 2016 21:49:13 GMT Date: Thu, 01 Sep 2016 21:49:13 GMT
Server: Docker/1.12.0 (linux) Server: Docker/1.13.0 (linux)
"7v2t30z9blmxuhnyo6s4cpenp" "7v2t30z9blmxuhnyo6s4cpenp"

77
docs/reference/commandline/info.md
View file

@ -47,7 +47,7 @@ available on the volume where `/var/lib/docker` is mounted.
## Display Docker system information ## 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: storage driver and a node that is part of a 2-node swarm:
$ docker -D info $ docker -D info
@ -56,49 +56,72 @@ storage driver and a node that is part of a 2-node swarm:
Paused: 1 Paused: 1
Stopped: 10 Stopped: 10
Images: 52 Images: 52
Server Version: 1.12.0-dev Server Version: 1.13.0
Storage Driver: overlay Storage Driver: overlay2
Backing Filesystem: extfs Backing Filesystem: extfs
Supports d_type: true
Native Overlay Diff: false
Logging Driver: json-file Logging Driver: json-file
Cgroup Driver: cgroupfs Cgroup Driver: cgroupfs
Plugins: Plugins:
Volume: local Volume: local
Network: bridge null host overlay Network: bridge host macvlan null overlay
Swarm: Swarm: active
NodeID: 0gac67oclbxq7 NodeID: rdjq45w1op418waxlairloqbm
Is Manager: true Is Manager: true
Managers: 2 ClusterID: te8kdyw33n36fqiz74bfjeixd
Managers: 1
Nodes: 2 Nodes: 2
Runtimes: default Orchestration:
Default Runtime: default Task History Retention Limit: 5
Security Options: apparmor seccomp Raft:
Kernel Version: 4.4.0-21-generic Snapshot Interval: 10000
Operating System: Ubuntu 16.04 LTS 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 OSType: linux
Architecture: x86_64 Architecture: x86_64
CPUs: 24 CPUs: 2
Total Memory: 62.86 GiB Total Memory: 1.937 GiB
Name: docker Name: ubuntu
ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S ID: H52R:7ZR6:EIIA:76JG:ORIY:BVKF:GSFU:HNPG:B5MK:APSC:SZ3Q:N326
Docker Root Dir: /var/lib/docker Docker Root Dir: /var/lib/docker
Debug mode (client): true Debug Mode (client): true
Debug mode (server): true Debug Mode (server): true
File Descriptors: 59 File Descriptors: 30
Goroutines: 159 Goroutines: 123
System Time: 2016-04-26T10:04:06.14689342-04:00 System Time: 2016-11-12T17:24:37.955404361-08:00
EventsListeners: 0 EventsListeners: 0
Http Proxy: http://test:test@localhost:8080 Http Proxy: http://proxy.example.com:80/
Https Proxy: https://test:test@localhost:8080
No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com
Username: svendowideit
Registry: https://index.docker.io/v1/ Registry: https://index.docker.io/v1/
WARNING: No swap limit support WARNING: No swap limit support
Labels: Labels:
storage=ssd storage=ssd
staging=true staging=true
Insecure registries: Experimental: false
myinsecurehost:5000 Insecure Registries:
127.0.0.0/8 127.0.0.0/8
Live Restore Enabled: false
The global `-D` option tells all `docker` commands to output debug information. 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 Paused: 0
Stopped: 1 Stopped: 1
Images: 17 Images: 17
Server Version: 1.13.0-dev Server Version: 1.13.0
Storage Driver: windowsfilter Storage Driver: windowsfilter
Windows: Windows:
Logging Driver: json-file Logging Driver: json-file

79
man/docker-info.1.md
View file

@ -39,7 +39,7 @@ available on the volume where `/var/lib/docker` is mounted.
## Display Docker system information ## 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: storage driver:
$ docker -D info $ docker -D info
@ -48,49 +48,74 @@ storage driver:
Paused: 1 Paused: 1
Stopped: 10 Stopped: 10
Images: 52 Images: 52
Server Version: 1.12.0-dev Server Version: 1.13.0
Storage Driver: overlay Storage Driver: overlay2
Backing Filesystem: extfs Backing Filesystem: extfs
Supports d_type: true
Native Overlay Diff: false
Logging Driver: json-file Logging Driver: json-file
Cgroup Driver: cgroupfs Cgroup Driver: cgroupfs
Plugins: Plugins:
Volume: local Volume: local
Network: bridge null host overlay Network: bridge host macvlan null overlay
Swarm: Swarm: active
NodeID: 0gac67oclbxq7 NodeID: rdjq45w1op418waxlairloqbm
IsManager: YES Is Manager: true
Managers: 2 ClusterID: te8kdyw33n36fqiz74bfjeixd
Managers: 1
Nodes: 2 Nodes: 2
Runtimes: default Orchestration:
Default Runtime: default Task History Retention Limit: 5
Security Options: apparmor seccomp Raft:
Kernel Version: 4.4.0-21-generic Snapshot Interval: 10000
Operating System: Ubuntu 16.04 LTS 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 OSType: linux
Architecture: x86_64 Architecture: x86_64
CPUs: 24 CPUs: 2
Total Memory: 62.86 GiB Total Memory: 1.937 GiB
Name: docker Name: ubuntu
ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S ID: H52R:7ZR6:EIIA:76JG:ORIY:BVKF:GSFU:HNPG:B5MK:APSC:SZ3Q:N326
Docker Root Dir: /var/lib/docker Docker Root Dir: /var/lib/docker
Debug mode (client): true Debug Mode (client): true
Debug mode (server): true Debug Mode (server): true
File Descriptors: 59 File Descriptors: 30
Goroutines: 159 Goroutines: 123
System Time: 2016-04-26T10:04:06.14689342-04:00 System Time: 2016-11-12T17:24:37.955404361-08:00
EventsListeners: 0 EventsListeners: 0
Http Proxy: http://test:test@localhost:8080 Http Proxy: http://proxy.example.com:80/
Https Proxy: https://test:test@localhost:8080
No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com
Username: svendowideit
Registry: https://index.docker.io/v1/ Registry: https://index.docker.io/v1/
WARNING: No swap limit support WARNING: No swap limit support
Labels: Labels:
storage=ssd storage=ssd
staging=true staging=true
Insecure registries: Experimental: false
myinsecurehost:5000 Insecure Registries:
127.0.0.0/8 127.0.0.0/8
Live Restore Enabled: false
The global `-D` option tells all `docker` commands to output debug information. The global `-D` option tells all `docker` commands to output debug information.