1. docker
  2. Commit 10d2d8aefd6c6cf5b542b3cd8bba1d7683544cf1
Browse code

Update docker info cli reference documentation

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit d28eaa11710f2aa0429ccdc3dc7fd83c67f2775c)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>

Vincent Demeester authored on 2016/11/24 01:20:12
Showing 2 changed files
docs/reference/commandline/info.md
History View file @ 10d2d8a
... ... 
@@ -111,7 +111,8 @@ storage driver and a node that is part of a 2-node swarm:
111 111 
      Goroutines: 123
112 112 
      System Time: 2016-11-12T17:24:37.955404361-08:00
113 113 
      EventsListeners: 0
114 
-    Http Proxy: http://proxy.example.com:80/
114 
+    Http Proxy: http://test:test@proxy.example.com:8080
115 
+    Https Proxy: https://test:test@proxy.example.com:8080
115 116 
     No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com
116 117 
     Registry: https://index.docker.io/v1/
117 118 
     WARNING: No swap limit support
... ... 
@@ -121,6 +122,9 @@ storage driver and a node that is part of a 2-node swarm:
121 121 
     Experimental: false
122 122 
     Insecure Registries:
123 123 
      127.0.0.0/8
124 
+    Registry Mirrors:
125 
+      http://192.168.1.2/
126 
+      http://registry-mirror.example.com:5000/
124 127 
     Live Restore Enabled: false
125 128
126 129 
 The global `-D` option tells all `docker` commands to output debug information.
... ... 
@@ -172,7 +176,7 @@ information about the devicemapper storage driver is shown:
172 172 
     Docker Root Dir: /var/lib/docker
173 173 
     Debug mode (client): false
174 174 
     Debug mode (server): false
175 
-    Username: xyz
175 
+    Username: gordontheturtle
176 176 
     Registry: https://index.docker.io/v1/
177 177 
     Insecure registries:
178 178 
      myinsecurehost:5000
... ... 
@@ -214,4 +218,7 @@ Here is a sample output for a daemon running on Windows Server 2016:
214 214 
     Registry: https://index.docker.io/v1/
215 215 
     Insecure Registries:
216 216 
      127.0.0.0/8
217 
+    Registry Mirrors:
218 
+      http://192.168.1.2/
219 
+      http://registry-mirror.example.com:5000/
217 220 
     Live Restore Enabled: false
man/docker-info.1.md
History View file @ 10d2d8a
... ... 
@@ -103,7 +103,8 @@ storage driver:
103 103 
      Goroutines: 123
104 104 
      System Time: 2016-11-12T17:24:37.955404361-08:00
105 105 
      EventsListeners: 0
106 
-    Http Proxy: http://proxy.example.com:80/
106 
+    Http Proxy: http://test:test@proxy.example.com:8080
107 
+    Https Proxy: https://test:test@proxy.example.com:8080
107 108 
     No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com
108 109 
     Registry: https://index.docker.io/v1/
109 110 
     WARNING: No swap limit support
... ... 
@@ -113,6 +114,9 @@ storage driver:
113 113 
     Experimental: false
114 114 
     Insecure Registries:
115 115 
      127.0.0.0/8
116 
+    Registry Mirrors:
117 
+      http://192.168.1.2/
118 
+      http://registry-mirror.example.com:5000/
116 119 
     Live Restore Enabled: false
117 120
118 121
... ... 
@@ -166,7 +170,7 @@ information about the devicemapper storage driver is shown:
166 166 
     Docker Root Dir: /var/lib/docker
167 167 
     Debug mode (client): false
168 168 
     Debug mode (server): false
169 
-    Username: xyz
169 
+    Username: gordontheturtle
170 170 
     Registry: https://index.docker.io/v1/
171 171 
     Insecure registries:
172 172 
      myinsecurehost:5000