1. docker
  2. Commit cd2d52b5f6746ab83b835390fc6eb1f13dabde48
Browse code

Merge pull request #28316 from yongtang/28018-docker-info-swarm-managers-docs

Update docs for `docker info` for most recent changes.

Vincent Demeester authored on 2016/11/16 20:08:35
Showing 4 changed files
docs/reference/api/docker_remote_api_v1.24.md
History View file @ cd2d52b
... ... 
@@ -2459,7 +2459,7 @@ Docker daemon report the following event:
2459 2459
2460 2460 
     HTTP/1.1 200 OK
2461 2461 
     Content-Type: application/json
2462 
-    Server: Docker/1.11.0 (linux)
2462 
+    Server: Docker/1.12.0 (linux)
2463 2463 
     Date: Fri, 29 Apr 2016 15:18:06 GMT
2464 2464 
     Transfer-Encoding: chunked
2465 2465
... ... 
@@ -3912,7 +3912,7 @@ List nodes
3912 3912 
             "MemoryBytes": 8272408576
3913 3913 
           },
3914 3914 
           "Engine": {
3915 
-            "EngineVersion": "1.12.0-dev",
3915 
+            "EngineVersion": "1.12.0",
3916 3916 
             "Labels": {
3917 3917 
                 "foo": "bar",
3918 3918 
             }
... ... 
@@ -4004,7 +4004,7 @@ Return low-level information on the node `id`
4004 4004 
           "MemoryBytes": 8272408576
4005 4005 
         },
4006 4006 
         "Engine": {
4007 
-          "EngineVersion": "1.12.0-dev",
4007 
+          "EngineVersion": "1.12.0",
4008 4008 
           "Labels": {
4009 4009 
               "foo": "bar",
4010 4010 
           }
docs/reference/api/docker_remote_api_v1.25.md
History View file @ cd2d52b
... ... 
@@ -2610,7 +2610,7 @@ Display system-wide information
2610 2610 
         "Name": "WIN-V0V70C0LU5P",
2611 2611 
         "Labels": null,
2612 2612 
         "ExperimentalBuild": false,
2613 
-        "ServerVersion": "1.13.0-dev",
2613 
+        "ServerVersion": "1.13.0",
2614 2614 
         "ClusterStore": "",
2615 2615 
         "ClusterAdvertise": "",
2616 2616 
         "SecurityOptions": null,
... ... 
@@ -2904,7 +2904,7 @@ Docker daemon report the following event:
2904 2904
2905 2905 
     HTTP/1.1 200 OK
2906 2906 
     Content-Type: application/json
2907 
-    Server: Docker/1.11.0 (linux)
2907 
+    Server: Docker/1.13.0 (linux)
2908 2908 
     Date: Fri, 29 Apr 2016 15:18:06 GMT
2909 2909 
     Transfer-Encoding: chunked
2910 2910
... ... 
@@ -4510,7 +4510,7 @@ List nodes
4510 4510 
             "MemoryBytes": 8272408576
4511 4511 
           },
4512 4512 
           "Engine": {
4513 
-            "EngineVersion": "1.12.0-dev",
4513 
+            "EngineVersion": "1.13.0",
4514 4514 
             "Labels": {
4515 4515 
                 "foo": "bar",
4516 4516 
             }
... ... 
@@ -4603,7 +4603,7 @@ Return low-level information on the node `id`
4603 4603 
           "MemoryBytes": 8272408576
4604 4604 
         },
4605 4605 
         "Engine": {
4606 
-          "EngineVersion": "1.12.0-dev",
4606 
+          "EngineVersion": "1.13.0",
4607 4607 
           "Labels": {
4608 4608 
               "foo": "bar",
4609 4609 
           }
... ... 
@@ -4813,7 +4813,7 @@ Initialize a new swarm. The body of the HTTP response includes the node ID.
4813 4813 
     Content-Length: 28
4814 4814 
     Content-Type: application/json
4815 4815 
     Date: Thu, 01 Sep 2016 21:49:13 GMT
4816 
-    Server: Docker/1.12.0 (linux)
4816 
+    Server: Docker/1.13.0 (linux)
4817 4817
4818 4818 
     "7v2t30z9blmxuhnyo6s4cpenp"
4819 4819
docs/reference/commandline/info.md
History View file @ cd2d52b
... ... 
@@ -47,7 +47,7 @@ available on the volume where `/var/lib/docker` is mounted.
47 47
48 48 
 ## Display Docker system information
49 49
50 
-Here is a sample output for a daemon running on Ubuntu, using the overlay
50 
+Here is a sample output for a daemon running on Ubuntu, using the overlay2
51 51 
 storage driver and a node that is part of a 2-node swarm:
52 52
53 53 
     $ docker -D info
... ... 
@@ -56,49 +56,72 @@ storage driver and a node that is part of a 2-node swarm:
56 56 
      Paused: 1
57 57 
      Stopped: 10
58 58 
     Images: 52
59 
-    Server Version: 1.12.0-dev
60 
-    Storage Driver: overlay
59 
+    Server Version: 1.13.0
60 
+    Storage Driver: overlay2
61 61 
      Backing Filesystem: extfs
62 
+     Supports d_type: true
63 
+     Native Overlay Diff: false
62 64 
     Logging Driver: json-file
63 65 
     Cgroup Driver: cgroupfs
64 66 
     Plugins:
65 67 
      Volume: local
66 
-     Network: bridge null host overlay
67 
-    Swarm:
68 
-     NodeID: 0gac67oclbxq7
68 
+     Network: bridge host macvlan null overlay
69 
+    Swarm: active
70 
+     NodeID: rdjq45w1op418waxlairloqbm
69 71 
      Is Manager: true
70 
-     Managers: 2
72 
+     ClusterID: te8kdyw33n36fqiz74bfjeixd
73 
+     Managers: 1
71 74 
      Nodes: 2
72 
-    Runtimes: default
73 
-    Default Runtime: default
74 
-    Security Options: apparmor seccomp
75 
-    Kernel Version: 4.4.0-21-generic
76 
-    Operating System: Ubuntu 16.04 LTS
75 
+     Orchestration:
76 
+      Task History Retention Limit: 5
77 
+     Raft:
78 
+      Snapshot Interval: 10000
79 
+      Number of Old Snapshots to Retain: 0
80 
+      Heartbeat Tick: 1
81 
+      Election Tick: 3
82 
+     Dispatcher:
83 
+      Heartbeat Period: 5 seconds
84 
+     CA Configuration:
85 
+      Expiry Duration: 3 months
86 
+     Node Address: 172.16.66.128 172.16.66.129
87 
+     Manager Addresses:
88 
+      172.16.66.128:2477
89 
+    Runtimes: runc
90 
+    Default Runtime: runc
91 
+    Init Binary: docker-init
92 
+    containerd version: 8517738ba4b82aff5662c97ca4627e7e4d03b531
93 
+    runc version: ac031b5bf1cc92239461125f4c1ffb760522bbf2
94 
+    init version: N/A (expected: v0.13.0)
95 
+    Security Options:
96 
+     apparmor
97 
+     seccomp
98 
+      Profile: default
99 
+    Kernel Version: 4.4.0-31-generic
100 
+    Operating System: Ubuntu 16.04.1 LTS
77 101 
     OSType: linux
78 102 
     Architecture: x86_64
79 
-    CPUs: 24
80 
-    Total Memory: 62.86 GiB
81 
-    Name: docker
82 
-    ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S
103 
+    CPUs: 2
104 
+    Total Memory: 1.937 GiB
105 
+    Name: ubuntu
106 
+    ID: H52R:7ZR6:EIIA:76JG:ORIY:BVKF:GSFU:HNPG:B5MK:APSC:SZ3Q:N326
83 107 
     Docker Root Dir: /var/lib/docker
84 
-    Debug mode (client): true
85 
-    Debug mode (server): true
86 
-     File Descriptors: 59
87 
-     Goroutines: 159
88 
-     System Time: 2016-04-26T10:04:06.14689342-04:00
108 
+    Debug Mode (client): true
109 
+    Debug Mode (server): true
110 
+     File Descriptors: 30
111 
+     Goroutines: 123
112 
+     System Time: 2016-11-12T17:24:37.955404361-08:00
89 113 
      EventsListeners: 0
90 
-    Http Proxy: http://test:test@localhost:8080
91 
-    Https Proxy: https://test:test@localhost:8080
114 
+    Http Proxy: http://proxy.example.com:80/
92 115 
     No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com
93 
-    Username: svendowideit
94 116 
     Registry: https://index.docker.io/v1/
95 117 
     WARNING: No swap limit support
96 118 
     Labels:
97 119 
      storage=ssd
98 120 
      staging=true
99 
-    Insecure registries:
100 
-     myinsecurehost:5000
121 
+    Experimental: false
122 
+    Insecure Registries:
101 123 
      127.0.0.0/8
124 
+    Live Restore Enabled: false
102 125
103 126 
 The global `-D` option tells all `docker` commands to output debug information.
104 127
... ... 
@@ -168,7 +191,7 @@ Here is a sample output for a daemon running on Windows Server 2016:
168 168 
      Paused: 0
169 169 
      Stopped: 1
170 170 
     Images: 17
171 
-    Server Version: 1.13.0-dev
171 
+    Server Version: 1.13.0
172 172 
     Storage Driver: windowsfilter
173 173 
      Windows:
174 174 
     Logging Driver: json-file
man/docker-info.1.md
History View file @ cd2d52b
... ... 
@@ -39,7 +39,7 @@ available on the volume where `/var/lib/docker` is mounted.
39 39
40 40 
 ## Display Docker system information
41 41
42 
-Here is a sample output for a daemon running on Ubuntu, using the overlay
42 
+Here is a sample output for a daemon running on Ubuntu, using the overlay2
43 43 
 storage driver:
44 44
45 45 
     $ docker -D info
... ... 
@@ -48,49 +48,74 @@ storage driver:
48 48 
      Paused: 1
49 49 
      Stopped: 10
50 50 
     Images: 52
51 
-    Server Version: 1.12.0-dev
52 
-    Storage Driver: overlay
51 
+    Server Version: 1.13.0
52 
+    Storage Driver: overlay2
53 53 
      Backing Filesystem: extfs
54 
+     Supports d_type: true
55 
+     Native Overlay Diff: false
54 56 
     Logging Driver: json-file
55 57 
     Cgroup Driver: cgroupfs
56 58 
     Plugins:
57 59 
      Volume: local
58 
-     Network: bridge null host overlay
59 
-    Swarm:
60 
-     NodeID: 0gac67oclbxq7
61 
-     IsManager: YES
62 
-     Managers: 2
60 
+     Network: bridge host macvlan null overlay
61 
+    Swarm: active
62 
+     NodeID: rdjq45w1op418waxlairloqbm
63 
+     Is Manager: true
64 
+     ClusterID: te8kdyw33n36fqiz74bfjeixd
65 
+     Managers: 1
63 66 
      Nodes: 2
64 
-    Runtimes: default
65 
-    Default Runtime: default
66 
-    Security Options: apparmor seccomp
67 
-    Kernel Version: 4.4.0-21-generic
68 
-    Operating System: Ubuntu 16.04 LTS
67 
+     Orchestration:
68 
+      Task History Retention Limit: 5
69 
+     Raft:
70 
+      Snapshot Interval: 10000
71 
+      Number of Old Snapshots to Retain: 0
72 
+      Heartbeat Tick: 1
73 
+      Election Tick: 3
74 
+     Dispatcher:
75 
+      Heartbeat Period: 5 seconds
76 
+     CA Configuration:
77 
+      Expiry Duration: 3 months
78 
+     Node Address: 172.16.66.128 172.16.66.129
79 
+     Manager Addresses:
80 
+      172.16.66.128:2477
81 
+    Runtimes: runc
82 
+    Default Runtime: runc
83 
+    Init Binary: docker-init
84 
+    containerd version: 8517738ba4b82aff5662c97ca4627e7e4d03b531
85 
+    runc version: ac031b5bf1cc92239461125f4c1ffb760522bbf2
86 
+    init version: N/A (expected: v0.13.0)
87 
+    Security Options:
88 
+     apparmor
89 
+     seccomp
90 
+      Profile: default
91 
+    Kernel Version: 4.4.0-31-generic
92 
+    Operating System: Ubuntu 16.04.1 LTS
69 93 
     OSType: linux
70 94 
     Architecture: x86_64
71 
-    CPUs: 24
72 
-    Total Memory: 62.86 GiB
73 
-    Name: docker
74 
-    ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S
95 
+    CPUs: 2
96 
+    Total Memory: 1.937 GiB
97 
+    Name: ubuntu
98 
+    ID: H52R:7ZR6:EIIA:76JG:ORIY:BVKF:GSFU:HNPG:B5MK:APSC:SZ3Q:N326
75 99 
     Docker Root Dir: /var/lib/docker
76 
-    Debug mode (client): true
77 
-    Debug mode (server): true
78 
-     File Descriptors: 59
79 
-     Goroutines: 159
80 
-     System Time: 2016-04-26T10:04:06.14689342-04:00
100 
+    Debug Mode (client): true
101 
+    Debug Mode (server): true
102 
+     File Descriptors: 30
103 
+     Goroutines: 123
104 
+     System Time: 2016-11-12T17:24:37.955404361-08:00
81 105 
      EventsListeners: 0
82 
-    Http Proxy: http://test:test@localhost:8080
83 
-    Https Proxy: https://test:test@localhost:8080
106 
+    Http Proxy: http://proxy.example.com:80/
84 107 
     No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com
85 
-    Username: svendowideit
86 108 
     Registry: https://index.docker.io/v1/
87 109 
     WARNING: No swap limit support
88 110 
     Labels:
89 111 
      storage=ssd
90 112 
      staging=true
91 
-    Insecure registries:
92 
-     myinsecurehost:5000
113 
+    Experimental: false
114 
+    Insecure Registries:
93 115 
      127.0.0.0/8
116 
+    Live Restore Enabled: false
117 
+
118 
+
94 119
95 120 
 The global `-D` option tells all `docker` commands to output debug information.
96 121