Browse code

Expose docker's root directory by default as part of `docker info`.

Signed-off-by: Vishnu kannan <vishnuk@google.com>

Vishnu kannan authored on 2016/02/04 11:10:48
Showing 3 changed files
... ...
@@ -73,7 +73,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
73 73
 	fmt.Fprintf(cli.out, "Total Memory: %s\n", units.BytesSize(float64(info.MemTotal)))
74 74
 	ioutils.FprintfIfNotEmpty(cli.out, "Name: %s\n", info.Name)
75 75
 	ioutils.FprintfIfNotEmpty(cli.out, "ID: %s\n", info.ID)
76
-
76
+	fmt.Fprintf(cli.out, "Docker Root Dir: %s\n", info.DockerRootDir)
77 77
 	fmt.Fprintf(cli.out, "Debug mode (client): %v\n", utils.IsDebugEnabled())
78 78
 	fmt.Fprintf(cli.out, "Debug mode (server): %v\n", info.Debug)
79 79
 
... ...
@@ -82,7 +82,6 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
82 82
 		fmt.Fprintf(cli.out, " Goroutines: %d\n", info.NGoroutines)
83 83
 		fmt.Fprintf(cli.out, " System Time: %s\n", info.SystemTime)
84 84
 		fmt.Fprintf(cli.out, " EventsListeners: %d\n", info.NEventsListener)
85
-		fmt.Fprintf(cli.out, " Docker Root Dir: %s\n", info.DockerRootDir)
86 85
 	}
87 86
 
88 87
 	ioutils.FprintfIfNotEmpty(cli.out, "Http Proxy: %s\n", info.HTTPProxy)
... ...
@@ -44,6 +44,7 @@ For example:
44 44
     Total Memory: 62.86 GiB
45 45
     Name: docker
46 46
     ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S
47
+    Docker Root Dir: /var/lib/docker
47 48
     Debug mode (client): true
48 49
     Debug mode (server): true
49 50
      File Descriptors: 59
... ...
@@ -51,7 +51,14 @@ Here is a sample output:
51 51
     Architecture: x86_64
52 52
     CPUs: 1
53 53
     Total Memory: 2 GiB
54
-
54
+    Name: docker
55
+    ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S
56
+    Docker Root Dir: /var/lib/docker
57
+    Debug mode (client): false
58
+    Debug mode (server): false
59
+    Username: xyz
60
+    Registry: https://index.docker.io/v1/
61
+	
55 62
 # HISTORY
56 63
 April 2014, Originally compiled by William Henry (whenry at redhat dot com)
57 64
 based on docker.com source material and internal work.