Merge pull request #5104 from crosbymichael/update-dns-vf-docs

Update dns and volumes-from docs
This commit is contained in:
James Turnbull 2014-04-09 06:55:52 -07:00
commit 407b11c26b

View file

@ -129,12 +129,10 @@ Create a container
"Cmd":[
"date"
],
"Dns":null,
"Image":"base",
"Volumes":{
"/tmp": {}
},
"VolumesFrom":"",
"WorkingDir":"",
"DisableNetwork": false,
"ExposedPorts":{
@ -203,10 +201,8 @@ Inspect a container
"Cmd": [
"date"
],
"Dns": null,
"Image": "base",
"Volumes": {},
"VolumesFrom": "",
"WorkingDir":""
},
@ -386,6 +382,8 @@ Start a container
"PortBindings":{ "22/tcp": [{ "HostPort": "11022" }] },
"PublishAllPorts":false,
"Privileged":false
"Dns": ["8.8.8.8"],
"VolumesFrom: ["parent", "other:ro"]
}
**Example response**:
@ -793,10 +791,8 @@ Inspect an image
"StdinOnce":false,
"Env":null,
"Cmd": ["/bin/bash"]
,"Dns":null,
"Image":"base",
"Volumes":null,
"VolumesFrom":"",
"WorkingDir":""
},
"Size": 6824592