Merge pull request #19249 from calavera/carry_17414

[Carry 17414] Added additional container information to "docker info".
Upstream-commit: a79f96828f7da2fc762002bf79ab8a9dcf908457
Component: engine
This commit is contained in:
Antonio Murdaca
2016-01-13 10:42:22 +01:00
10 changed files with 80 additions and 0 deletions

View File

@ -113,6 +113,7 @@ This section lists each version from latest to oldest. Each listing includes a
* `GET /networks` now supports filtering by `name`, `id` and `type`.
* `POST /containers/create` now allows you to set the static IPv4 and/or IPv6 address for the container.
* `POST /networks/(id)/connect` now allows you to set the static IPv4 and/or IPv6 address for the container.
* `GET /info` now includes the number of containers running, stopped, and paused.
### v1.21 API changes

View File

@ -2081,6 +2081,9 @@ Display system-wide information
{
"Architecture": "x86_64",
"Containers": 11,
"ContainersRunning": 7,
"ContainersStopped": 3,
"ContainersPaused": 1,
"CpuCfsPeriod": true,
"CpuCfsQuota": true,
"Debug": false,