clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-26 09:36:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes incorrect API spec for items moved to HostConfig

Browse Source 
DNS and VolumesFrom were moved to HostConfig and as such are part of the
container start and not create.
For some reason 0.10 docs are correct (except for a missing quote in the
JSON") but 0.11 and latest are not.

Docker-DCO-1.1-Signed-off-by: cpuguy83 <cpuguy83@gmail.com> (github: cpuguy83)
This commit is contained in:
cpuguy83
2014-06-05 09:50:27 -04:00
parent 7e96f8de1c
commit 8c646ebf16
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/reference/api/docker_remote_api_v1.10.md
+1 -1
View File
@@ -371,7 +371,7 @@ Start the container `id`
"PublishAllPorts":false,
"Privileged":false
"Dns": ["8.8.8.8"],
"VolumesFrom: ["parent", "other:ro"]
"VolumesFrom": ["parent", "other:ro"]
}
**Example response**:
docs/sources/reference/api/docker_remote_api_v1.11.md
+3 -2
View File
@@ -123,7 +123,6 @@ Create a container
"Cmd":[
"date"
],
"Dns":null,
"Image":"base",
"Volumes":{
"/tmp": {}
@@ -410,7 +409,9 @@ Start the container `id`
"LxcConf":{"lxc.utsname":"docker"},
"PortBindings":{ "22/tcp": [{ "HostPort": "11022" }] },
"PublishAllPorts":false,
"Privileged":false
"Privileged":false,
"Dns": ["8.8.8.8"],
"VolumesFrom": ["parent", "other:ro"]
}
**Example response**:
docs/sources/reference/api/docker_remote_api_v1.12.md
+3 -3
View File
@@ -124,12 +124,10 @@ Create a container
"Cmd":[
"date"
],
"Dns":null,
"Image":"base",
"Volumes":{
"/tmp": {}
},
"VolumesFrom":"",
"WorkingDir":"",
"DisableNetwork": false,
"ExposedPorts":{
@@ -411,7 +409,9 @@ Start the container `id`
"LxcConf":{"lxc.utsname":"docker"},
"PortBindings":{ "22/tcp": [{ "HostPort": "11022" }] },
"PublishAllPorts":false,
"Privileged":false
"Privileged":false,
"Dns": ["8.8.8.8"],
"VolumesFrom": ["parent", "other:ro"]
}
**Example response**: