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

Merge pull request #16415 from HuKeping/dockerinfo

Browse source 
Format output of docker info
This commit is contained in:
Brian Goff 2015-09-23 21:15:23 -04:00
commit 40e8560412
4 changed files with 57 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
api/client/info.go
View file

@ -73,7 +73,8 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
fmt.Fprintf(cli.out, "Registry: %v\n", info.IndexServerAddress) fmt.Fprintf(cli.out, "Registry: %v\n", info.IndexServerAddress)
} }
} }
// Only output these warnings if the server supports these features
// Only output these warnings if the server does not support these features
if h, err := httputils.ParseServerHeader(serverResp.header.Get("Server")); err == nil { if h, err := httputils.ParseServerHeader(serverResp.header.Get("Server")); err == nil {
if h.OS != "windows" { if h.OS != "windows" {
if !info.MemoryLimit { if !info.MemoryLimit {
@ -101,9 +102,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
} }
} }
if info.ExperimentalBuild { ioutils.FprintfIfTrue(cli.out, "Experimental: %v\n", info.ExperimentalBuild)
fmt.Fprintf(cli.out, "Experimental: true\n")
}
return nil return nil
} }

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

@ -26,25 +26,26 @@ For example:
Root Dir: /var/lib/docker/aufs Root Dir: /var/lib/docker/aufs
Backing Filesystem: extfs Backing Filesystem: extfs
Dirs: 545 Dirs: 545
Dirperm1 Supported: true
Execution Driver: native-0.2 Execution Driver: native-0.2
Logging Driver: json-file Logging Driver: json-file
Kernel Version: 3.13.0-24-generic Kernel Version: 3.19.0-22-generic
Operating System: Ubuntu 14.04 LTS Operating System: Ubuntu 15.04
CPUs: 1 CPUs: 24
Name: prod-server-42 Total Memory: 62.86 GiB
ID: 7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS Name: docker
Total Memory: 2 GiB ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S
Debug mode (server): false Debug mode (server): true
Debug mode (client): true File Descriptors: 59
File Descriptors: 10 Goroutines: 159
Goroutines: 9 System Time: 2015-09-23T14:04:20.699842089+08:00
System Time: Tue Mar 10 18:38:57 UTC 2015
EventsListeners: 0 EventsListeners: 0
Init SHA1:
Init Path: /usr/bin/docker Init Path: /usr/bin/docker
Docker Root Dir: /var/lib/docker Docker Root Dir: /var/lib/docker
Http Proxy: http://test:test@localhost:8080 Http Proxy: http://test:test@localhost:8080
Https Proxy: https://test:test@localhost:8080 Https Proxy: https://test:test@localhost:8080
No Proxy: 9.81.1.160 WARNING: No swap limit support
Username: svendowideit Username: svendowideit
Registry: [https://index.docker.io/v1/] Registry: [https://index.docker.io/v1/]
Labels: Labels:

29
docs/userguide/labels-custom-metadata.md
View file

@ -185,29 +185,36 @@ on how to query labels set on a container.
These labels appear as part of the `docker info` output for the daemon: These labels appear as part of the `docker info` output for the daemon:
docker -D info $ docker -D info
Containers: 12 Containers: 12
Images: 672 Images: 672
Engine Version: 1.9.0
Storage Driver: aufs Storage Driver: aufs
Root Dir: /var/lib/docker/aufs Root Dir: /var/lib/docker/aufs
Backing Filesystem: extfs Backing Filesystem: extfs
Dirs: 697 Dirs: 697
Dirperm1 Supported: true
Execution Driver: native-0.2 Execution Driver: native-0.2
Logging Driver: json-file Logging Driver: json-file
Kernel Version: 3.13.0-32-generic Kernel Version: 3.19.0-22-generic
Operating System: Ubuntu 14.04.1 LTS Operating System: Ubuntu 15.04
CPUs: 1 CPUs: 24
Total Memory: 994.1 MiB Total Memory: 62.86 GiB
Name: docker.example.com Name: docker
ID: RC3P:JTCT:32YS:XYSB:YUBG:VFED:AAJZ:W3YW:76XO:D7NN:TEVU:UCRW ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S
Debug mode (server): false Debug mode (server): true
Debug mode (client): true File Descriptors: 59
File Descriptors: 11 Goroutines: 159
Goroutines: 14 System Time: 2015-09-23T14:04:20.699842089+08:00
EventsListeners: 0 EventsListeners: 0
Init SHA1:
Init Path: /usr/bin/docker Init Path: /usr/bin/docker
Docker Root Dir: /var/lib/docker Docker Root Dir: /var/lib/docker
Http Proxy: http://test:test@localhost:8080
Https Proxy: https://test:test@localhost:8080
WARNING: No swap limit support WARNING: No swap limit support
Username: svendowideit
Registry: [https://index.docker.io/v1/]
Labels: Labels:
com.example.environment=production com.example.environment=production
com.example.storage=ssd com.example.storage=ssd

8
pkg/ioutils/fmt.go
View file

@ -12,3 +12,11 @@ func FprintfIfNotEmpty(w io.Writer, format, value string) (int, error) {
} }
return 0, nil return 0, nil
} }
// FprintfIfTrue prints the boolean value if it's true
func FprintfIfTrue(w io.Writer, format string, ok bool) (int, error) {
if ok {
return fmt.Fprintf(w, format, ok)
}
return 0, nil
}