Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update docker info cli reference documentation 

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2016-11-23 17:20:12 +01:00 committed by Tibor Vass
parent 7792b0d382
commit 0202ece8e1
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/reference/commandline/info.md
View File

@ -111,7 +111,8 @@ storage driver and a node that is part of a 2-node swarm:
Goroutines: 123 Goroutines: 123
System Time: 2016-11-12T17:24:37.955404361-08:00 System Time: 2016-11-12T17:24:37.955404361-08:00
EventsListeners: 0 EventsListeners: 0
Http Proxy: http://proxy.example.com:80/ Http Proxy: http://test:test@proxy.example.com:8080
Https Proxy: https://test:test@proxy.example.com:8080
No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com
Registry: https://index.docker.io/v1/ Registry: https://index.docker.io/v1/
WARNING: No swap limit support WARNING: No swap limit support
@ -121,6 +122,9 @@ storage driver and a node that is part of a 2-node swarm:
Experimental: false Experimental: false
Insecure Registries: Insecure Registries:
127.0.0.0/8 127.0.0.0/8
Registry Mirrors:
http://192.168.1.2/
http://registry-mirror.example.com:5000/
Live Restore Enabled: false 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.
@ -172,7 +176,7 @@ information about the devicemapper storage driver is shown:
Docker Root Dir: /var/lib/docker Docker Root Dir: /var/lib/docker
Debug mode (client): false Debug mode (client): false
Debug mode (server): false Debug mode (server): false
Username: xyz Username: gordontheturtle
Registry: https://index.docker.io/v1/ Registry: https://index.docker.io/v1/
Insecure registries: Insecure registries:
myinsecurehost:5000 myinsecurehost:5000
@ -214,4 +218,7 @@ Here is a sample output for a daemon running on Windows Server 2016:
Registry: https://index.docker.io/v1/ Registry: https://index.docker.io/v1/
Insecure Registries: Insecure Registries:
127.0.0.0/8 127.0.0.0/8
Registry Mirrors:
http://192.168.1.2/
http://registry-mirror.example.com:5000/
Live Restore Enabled: false Live Restore Enabled: false

8
man/docker-info.1.md
View File

@ -103,7 +103,8 @@ storage driver:
Goroutines: 123 Goroutines: 123
System Time: 2016-11-12T17:24:37.955404361-08:00 System Time: 2016-11-12T17:24:37.955404361-08:00
EventsListeners: 0 EventsListeners: 0
Http Proxy: http://proxy.example.com:80/ Http Proxy: http://test:test@proxy.example.com:8080
Https Proxy: https://test:test@proxy.example.com:8080
No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com
Registry: https://index.docker.io/v1/ Registry: https://index.docker.io/v1/
WARNING: No swap limit support WARNING: No swap limit support
@ -113,6 +114,9 @@ storage driver:
Experimental: false Experimental: false
Insecure Registries: Insecure Registries:
127.0.0.0/8 127.0.0.0/8
Registry Mirrors:
http://192.168.1.2/
http://registry-mirror.example.com:5000/
Live Restore Enabled: false Live Restore Enabled: false
@ -166,7 +170,7 @@ information about the devicemapper storage driver is shown:
Docker Root Dir: /var/lib/docker Docker Root Dir: /var/lib/docker
Debug mode (client): false Debug mode (client): false
Debug mode (server): false Debug mode (server): false
Username: xyz Username: gordontheturtle
Registry: https://index.docker.io/v1/ Registry: https://index.docker.io/v1/
Insecure registries: Insecure registries:
myinsecurehost:5000 myinsecurehost:5000