1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Fixes incorrect API spec for items moved to HostConfig

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

View file

@ -371,7 +371,7 @@ Start the container `id`
"PublishAllPorts":false, "PublishAllPorts":false,
"Privileged":false "Privileged":false
"Dns": ["8.8.8.8"], "Dns": ["8.8.8.8"],
"VolumesFrom: ["parent", "other:ro"] "VolumesFrom": ["parent", "other:ro"]
} }
**Example response**: **Example response**:

View file

@ -123,7 +123,6 @@ Create a container
"Cmd":[ "Cmd":[
"date" "date"
], ],
"Dns":null,
"Image":"base", "Image":"base",
"Volumes":{ "Volumes":{
"/tmp": {} "/tmp": {}
@ -410,7 +409,9 @@ Start the container `id`
"LxcConf":{"lxc.utsname":"docker"}, "LxcConf":{"lxc.utsname":"docker"},
"PortBindings":{ "22/tcp": [{ "HostPort": "11022" }] }, "PortBindings":{ "22/tcp": [{ "HostPort": "11022" }] },
"PublishAllPorts":false, "PublishAllPorts":false,
"Privileged":false "Privileged":false,
"Dns": ["8.8.8.8"],
"VolumesFrom": ["parent", "other:ro"]
} }
**Example response**: **Example response**:

View file

@ -124,12 +124,10 @@ Create a container
"Cmd":[ "Cmd":[
"date" "date"
], ],
"Dns":null,
"Image":"base", "Image":"base",
"Volumes":{ "Volumes":{
"/tmp": {} "/tmp": {}
}, },
"VolumesFrom":"",
"WorkingDir":"", "WorkingDir":"",
"DisableNetwork": false, "DisableNetwork": false,
"ExposedPorts":{ "ExposedPorts":{
@ -411,7 +409,9 @@ Start the container `id`
"LxcConf":{"lxc.utsname":"docker"}, "LxcConf":{"lxc.utsname":"docker"},
"PortBindings":{ "22/tcp": [{ "HostPort": "11022" }] }, "PortBindings":{ "22/tcp": [{ "HostPort": "11022" }] },
"PublishAllPorts":false, "PublishAllPorts":false,
"Privileged":false "Privileged":false,
"Dns": ["8.8.8.8"],
"VolumesFrom": ["parent", "other:ro"]
} }
**Example response**: **Example response**: