Merge pull request #5413 from SvenDowideit/docker-info-list-sockets

Add Sockets (-H) list to `docker -D info`.
This commit is contained in:
Victor Vieux 2014-06-24 10:40:53 -07:00
commit e23e3a1600
11 changed files with 1437 additions and 15 deletions

View file

@ -9,7 +9,7 @@ feels wrong or incomplete.
When reporting [issues](https://github.com/dotcloud/docker/issues)
on GitHub please include your host OS (Ubuntu 12.04, Fedora 19, etc),
the output of `uname -a` and the output of `docker version` along with
the output of `docker info`. Please include the steps required to reproduce
the output of `docker -D info`. Please include the steps required to reproduce
the problem if possible and applicable.
This information will help us review and fix your issue faster.

View file

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

View file

@ -96,6 +96,7 @@ type Daemon struct {
containerGraph *graphdb.Database
driver graphdriver.Driver
execDriver execdriver.Driver
Sockets []string
}
// Install installs daemon capabilities to eng.
@ -878,6 +879,7 @@ func NewDaemonFromDirectory(config *daemonconfig.Config, eng *engine.Engine) (*D
sysInitPath: sysInitPath,
execDriver: ed,
eng: eng,
Sockets: config.Sockets,
}
if err := daemon.checkLocaldns(); err != nil {

View file

@ -31,6 +31,7 @@ type Config struct {
DisableNetwork bool
EnableSelinuxSupport bool
Context map[string][]string
Sockets []string
}
// ConfigFromJob creates and returns a new DaemonConfig object
@ -66,6 +67,9 @@ func ConfigFromJob(job *engine.Job) *Config {
config.Mtu = GetDefaultNetworkMtu()
}
config.DisableNetwork = config.BridgeIface == DisableNetworkBridge
if sockets := job.GetenvList("Sockets"); sockets != nil {
config.Sockets = sockets
}
return config
}

View file

@ -162,6 +162,7 @@ func main() {
job.Setenv("ExecDriver", *flExecDriver)
job.SetenvInt("Mtu", *flMtu)
job.SetenvBool("EnableSelinuxSupport", *flSelinuxEnabled)
job.SetenvList("Sockets", flHosts.GetAll())
if err := job.Run(); err != nil {
log.Fatal(err)
}

View file

@ -18,7 +18,7 @@ page_keywords: API, Docker, rcli, REST, documentation
encoded (JSON) string with credentials:
`{'username': string, 'password': string, 'email': string, 'serveraddress' : string}`
The current version of the API is v1.12
The current version of the API is v1.13
Calling `/images/<name>/insert` is the same as calling
`/v1.12/images/<name>/insert`.
@ -26,6 +26,18 @@ Calling `/images/<name>/insert` is the same as calling
You can still call an old version of the API using
`/v1.12/images/<name>/insert`.
## v1.13
### Full Documentation
[*Docker Remote API v1.13*](/reference/api/docker_remote_api_v1.13/)
### What's new
**New!**
`Sockets` parameter added to the `/info` endpoint listing all the sockets the
daemon is configured to listen on.
## v1.12
### Full Documentation

View file

@ -1099,9 +1099,15 @@ Display system-wide information
{
"Containers":11,
"Images":16,
"Driver":"btrfs",
"ExecutionDriver":"native-0.1",
"KernelVersion":"3.12.0-1-amd64"
"Debug":false,
"NFd": 11,
"NGoroutines":21,
"NEventsListener":0,
"InitPath":"/usr/bin/docker",
"IndexServerAddress":["https://index.docker.io/v1/"],
"MemoryLimit":true,
"SwapLimit":false,
"IPv4Forwarding":true

View file

@ -1136,9 +1136,15 @@ Display system-wide information
{
"Containers":11,
"Images":16,
"Driver":"btrfs",
"ExecutionDriver":"native-0.1",
"KernelVersion":"3.12.0-1-amd64"
"Debug":false,
"NFd": 11,
"NGoroutines":21,
"NEventsListener":0,
"InitPath":"/usr/bin/docker",
"IndexServerAddress":["https://index.docker.io/v1/"],
"MemoryLimit":true,
"SwapLimit":false,
"IPv4Forwarding":true

File diff suppressed because it is too large Load diff

View file

@ -563,25 +563,30 @@ tar, then the ownerships might not get preserved.
## info
Usage: docker info
Display system-wide information
Usage: docker info
For example:
$ sudo docker info
Containers: 292
Images: 194
$ sudo docker -D info
Containers: 16
Images: 2138
Storage Driver: btrfs
Execution Driver: native-0.1
Kernel Version: 3.12.0-1-amd64
Debug mode (server): false
Debug mode (client): false
Fds: 22
Goroutines: 67
LXC Version: 0.9.0
EventsListeners: 115
Kernel Version: 3.8.0-33-generic
WARNING: No swap limit support
Debug mode (client): true
Fds: 16
Goroutines: 104
EventsListeners: 0
Init Path: /usr/bin/docker
Sockets: [unix:///var/run/docker.sock tcp://0.0.0.0:4243]
Username: svendowideit
Registry: [https://index.docker.io/v1/]
When sending issue reports, please use `docker version` and `docker info` to
The global `-D` option tells all `docker` comands to output debug information.
When sending issue reports, please use `docker version` and `docker -D info` to
ensure we know how your setup is configured.
## inspect

View file

@ -780,6 +780,7 @@ func (srv *Server) DockerInfo(job *engine.Job) engine.Status {
v.Set("IndexServerAddress", registry.IndexServerAddress())
v.Set("InitSha1", dockerversion.INITSHA1)
v.Set("InitPath", initPath)
v.SetList("Sockets", srv.daemon.Sockets)
if _, err := v.WriteTo(job.Stdout); err != nil {
return job.Error(err)
}