p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9933 from cpuguy83/fix_api_docs_for_info

Browse Source 
doc: Update API docs to reflect correct values for /info
Upstream-commit: f65b781d2151973c233d7c517635208c2b96dce4
Component: engine
This commit is contained in:
Sven Dowideit
2015-01-07 14:26:28 +10:00
parent 1ccf95f569 873526f7b8
commit 5bab4d3f4f
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/docs/sources/reference/api/docker_remote_api_v1.16.md
View File

@ -1223,6 +1223,7 @@ Display system-wide information
"Containers":11,
"Images":16,
"Driver":"btrfs",
"DriverStatus": [[""]],
"ExecutionDriver":"native-0.1",
"KernelVersion":"3.12.0-1-amd64"
"NCPU":1,
@ -1234,11 +1235,14 @@ Display system-wide information
"NGoroutines":21,
"NEventsListener":0,
"InitPath":"/usr/bin/docker",
"InitSha1":"",
"IndexServerAddress":["https://index.docker.io/v1/"],
"MemoryLimit":true,
"SwapLimit":false,
"IPv4Forwarding":true,
"Labels":["storage=ssd"]
"Labels":["storage=ssd"],
"DockerRootDir": "/var/lib/docker",
"OperatingSystem": "Boot2Docker",
}
Status Codes:

6
components/engine/docs/sources/reference/api/docker_remote_api_v1.17.md
View File

@ -1237,6 +1237,7 @@ Display system-wide information
"Containers":11,
"Images":16,
"Driver":"btrfs",
"DriverStatus": [[""]],
"ExecutionDriver":"native-0.1",
"KernelVersion":"3.12.0-1-amd64"
"NCPU":1,
@ -1248,11 +1249,14 @@ Display system-wide information
"NGoroutines":21,
"NEventsListener":0,
"InitPath":"/usr/bin/docker",
"InitSha1":"",
"IndexServerAddress":["https://index.docker.io/v1/"],
"MemoryLimit":true,
"SwapLimit":false,
"IPv4Forwarding":true,
"Labels":["storage=ssd"]
"Labels":["storage=ssd"],
"DockerRootDir": "/var/lib/docker",
"OperatingSystem": "Boot2Docker",
}
Status Codes: