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 #9489 from crosbymichael/info-root

Browse source 
Return docker's root dir in docker -D info
This commit is contained in:
Arnaud Porterie 2014-12-08 09:05:00 -08:00
commit 12252e39a0
3 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/client/commands.go
View file

@ -544,6 +544,9 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
if initPath := remoteInfo.Get("InitPath"); initPath != "" { if initPath := remoteInfo.Get("InitPath"); initPath != "" {
fmt.Fprintf(cli.out, "Init Path: %s\n", initPath) fmt.Fprintf(cli.out, "Init Path: %s\n", initPath)
} }
if root := remoteInfo.Get("DockerRootDir"); root != "" {
fmt.Fprintf(cli.out, "Docker Root Dir: %s\n", root)
}
} }
if len(remoteInfo.GetList("IndexServerAddress")) != 0 { if len(remoteInfo.GetList("IndexServerAddress")) != 0 {

1
daemon/info.go
View file

@ -76,6 +76,7 @@ func (daemon *Daemon) CmdInfo(job *engine.Job) engine.Status {
v.Set("InitPath", initPath) v.Set("InitPath", initPath)
v.SetInt("NCPU", runtime.NumCPU()) v.SetInt("NCPU", runtime.NumCPU())
v.SetInt64("MemTotal", meminfo.MemTotal) v.SetInt64("MemTotal", meminfo.MemTotal)
v.Set("DockerRootDir", daemon.Config().Root)
if hostname, err := os.Hostname(); err == nil { if hostname, err := os.Hostname(); err == nil {
v.Set("Name", hostname) v.Set("Name", hostname)
} }

1
docs/sources/reference/commandline/cli.md
View file

@ -1066,6 +1066,7 @@ For example:
Goroutines: 9 Goroutines: 9
EventsListeners: 0 EventsListeners: 0
Init Path: /usr/bin/docker Init Path: /usr/bin/docker
Docker Root Dir: /var/lib/docker
Username: svendowideit Username: svendowideit
Registry: [https://index.docker.io/v1/] Registry: [https://index.docker.io/v1/]
Labels: Labels: