docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bring /info API doc in line with the actual response. 

The fix handles versions 1.18 and 1.19.

Closes #13139.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
This commit is contained in:
Raghuram Devarakonda 2015-05-18 13:43:02 -04:00
parent 19ae59f910
commit 9c0608565c
4 changed files with 99 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/mkdocs.yml
View File

@ -158,6 +158,7 @@ pages:
- ['reference/api/docker-io_api.md', 'Reference', 'Docker Hub API'] - ['reference/api/docker-io_api.md', 'Reference', 'Docker Hub API']
#- ['reference/image-spec-v1.md', 'Reference', 'Docker Image Specification v1.0.0'] #- ['reference/image-spec-v1.md', 'Reference', 'Docker Image Specification v1.0.0']
- ['reference/api/docker_remote_api.md', 'Reference', 'Docker Remote API'] - ['reference/api/docker_remote_api.md', 'Reference', 'Docker Remote API']
- ['reference/api/docker_remote_api_v1.19.md', 'Reference', 'Docker Remote API v1.19']
- ['reference/api/docker_remote_api_v1.18.md', 'Reference', 'Docker Remote API v1.18'] - ['reference/api/docker_remote_api_v1.18.md', 'Reference', 'Docker Remote API v1.18']
- ['reference/api/docker_remote_api_v1.17.md', 'Reference', 'Docker Remote API v1.17'] - ['reference/api/docker_remote_api_v1.17.md', 'Reference', 'Docker Remote API v1.17']
- ['reference/api/docker_remote_api_v1.16.md', 'Reference', 'Docker Remote API v1.16'] - ['reference/api/docker_remote_api_v1.16.md', 'Reference', 'Docker Remote API v1.16']

10
docs/sources/reference/api/docker_remote_api.md
View File

@ -58,6 +58,16 @@ disconnect
This endpoint now accepts a `since` timestamp parameter. This endpoint now accepts a `since` timestamp parameter.
`GET /info`
**New!**
The fields `Debug`, `IPv4Forwarding`, `MemoryLimit`, and `SwapLimit`
are now returned as boolean instead of as an int.
In addition, the end point now returns the new boolean fields
`CpuCfsPeriod`, `CpuCfsQuota`, and `OomKillDisable`.
## v1.18 ## v1.18
### Full documentation ### Full documentation

53
docs/sources/reference/api/docker_remote_api_v1.18.md
View File

@ -1595,32 +1595,47 @@ Display system-wide information
{ {
"Containers": 11, "Containers": 11,
"Images":16, "Debug": 0,
"DockerRootDir": "/var/lib/docker",
"Driver": "btrfs", "Driver": "btrfs",
"DriverStatus": [[""]], "DriverStatus": [[""]],
"ExecutionDriver": "native-0.1", "ExecutionDriver": "native-0.1",
"KernelVersion":"3.12.0-1-amd64" "HttpProxy": "http://test:test@localhost:8080",
"NCPU":1, "HttpsProxy": "https://test:test@localhost:8080",
"MemTotal":2099236864,
"Name":"prod-server-42",
"ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS", "ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS",
"Debug":false, "IPv4Forwarding": 1,
"NFd": 11, "Images": 16,
"NGoroutines":21, "IndexServerAddress": "https://index.docker.io/v1/",
"SystemTime": "2015-03-10T11:11:23.730591467-07:00"
"NEventsListener":0,
"InitPath": "/usr/bin/docker", "InitPath": "/usr/bin/docker",
"InitSha1": "", "InitSha1": "",
"IndexServerAddress":["https://index.docker.io/v1/"], "KernelVersion": "3.12.0-1-amd64",
"MemoryLimit":true, "Labels": [
"SwapLimit":false, "storage=ssd"
"IPv4Forwarding":true, ],
"Labels":["storage=ssd"], "MemTotal": 2099236864,
"DockerRootDir": "/var/lib/docker", "MemoryLimit": 1,
"HttpProxy": "http://test:test@localhost:8080" "NCPU": 1,
"HttpsProxy": "https://test:test@localhost:8080" "NEventsListener": 0,
"NoProxy": "9.81.1.160" "NFd": 11,
"NGoroutines": 21,
"Name": "prod-server-42",
"NoProxy": "9.81.1.160",
"OperatingSystem": "Boot2Docker", "OperatingSystem": "Boot2Docker",
"RegistryConfig": {
"IndexConfigs": {
"docker.io": {
"Mirrors": null,
"Name": "docker.io",
"Official": true,
"Secure": true
}
},
"InsecureRegistryCIDRs": [
"127.0.0.0/8"
]
},
"SwapLimit": 0,
"SystemTime": "2015-03-10T11:11:23.730591467-07:00"
} }
Status Codes: Status Codes:

54
docs/sources/reference/api/docker_remote_api_v1.19.md
View File

@ -1613,32 +1613,50 @@ Display system-wide information
{ {
"Containers": 11, "Containers": 11,
"Images":16, "CpuCfsPeriod": true,
"CpuCfsQuota": true,
"Debug": false,
"DockerRootDir": "/var/lib/docker",
"Driver": "btrfs", "Driver": "btrfs",
"DriverStatus": [[""]], "DriverStatus": [[""]],
"ExecutionDriver": "native-0.1", "ExecutionDriver": "native-0.1",
"KernelVersion":"3.12.0-1-amd64" "HttpProxy": "http://test:test@localhost:8080",
"NCPU":1, "HttpsProxy": "https://test:test@localhost:8080",
"MemTotal":2099236864,
"Name":"prod-server-42",
"ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS", "ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS",
"Debug":false, "IPv4Forwarding": true,
"NFd": 11, "Images": 16,
"NGoroutines":21, "IndexServerAddress": "https://index.docker.io/v1/",
"SystemTime": "2015-03-10T11:11:23.730591467-07:00"
"NEventsListener":0,
"InitPath": "/usr/bin/docker", "InitPath": "/usr/bin/docker",
"InitSha1": "", "InitSha1": "",
"IndexServerAddress":["https://index.docker.io/v1/"], "KernelVersion": "3.12.0-1-amd64",
"Labels": [
"storage=ssd"
],
"MemTotal": 2099236864,
"MemoryLimit": true, "MemoryLimit": true,
"SwapLimit":false, "NCPU": 1,
"IPv4Forwarding":true, "NEventsListener": 0,
"Labels":["storage=ssd"], "NFd": 11,
"DockerRootDir": "/var/lib/docker", "NGoroutines": 21,
"HttpProxy": "http://test:test@localhost:8080" "Name": "prod-server-42",
"HttpsProxy": "https://test:test@localhost:8080" "NoProxy": "9.81.1.160",
"NoProxy": "9.81.1.160" "OomKillDisable": true,
"OperatingSystem": "Boot2Docker", "OperatingSystem": "Boot2Docker",
"RegistryConfig": {
"IndexConfigs": {
"docker.io": {
"Mirrors": null,
"Name": "docker.io",
"Official": true,
"Secure": true
}
},
"InsecureRegistryCIDRs": [
"127.0.0.0/8"
]
},
"SwapLimit": false,
"SystemTime": "2015-03-10T11:11:23.730591467-07:00"
} }
Status Codes: Status Codes: