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

Merge pull request #6215 from cpuguy83/fix_volumes_from_api_doc

Browse source 
Fixes incorrect API spec for items moved to HostConfig
This commit is contained in:
Sven Dowideit 2014-06-05 10:33:16 -07:00
commit 734d108ed2
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/sources/reference/api/docker_remote_api_v1.10.md
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**:

5
docs/sources/reference/api/docker_remote_api_v1.11.md
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**:

6
docs/sources/reference/api/docker_remote_api_v1.12.md
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**: