From 8b91dd2d6d498a297c5f442b45c6a6fa117c727d Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 8 Apr 2014 19:17:30 -0700 Subject: [PATCH] Update dns and volumes-from docs Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: a43a600a2cb516813a045e3b90e8a9ae81d8a783 Component: engine --- .../sources/reference/api/docker_remote_api_v1.10.rst | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/components/engine/docs/sources/reference/api/docker_remote_api_v1.10.rst b/components/engine/docs/sources/reference/api/docker_remote_api_v1.10.rst index 98827c9eb2..3d6af7e939 100644 --- a/components/engine/docs/sources/reference/api/docker_remote_api_v1.10.rst +++ b/components/engine/docs/sources/reference/api/docker_remote_api_v1.10.rst @@ -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