1. docker
  2. Commit 8c646ebf16bd0e2618cbca430bc129ee7416a21c
Browse code

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)

cpuguy83 authored on 2014/06/05 22:50:27
Showing 3 changed files
docs/sources/reference/api/docker_remote_api_v1.10.md
History View file @ 8c646eb
... ... 
@@ -371,7 +371,7 @@ Start the container `id`
371 371 
              "PublishAllPorts":false,
372 372 
              "Privileged":false
373 373 
              "Dns": ["8.8.8.8"],
374 
-             "VolumesFrom: ["parent", "other:ro"]
374 
+             "VolumesFrom": ["parent", "other:ro"]
375 375 
         }
376 376
377 377 
     **Example response**:
docs/sources/reference/api/docker_remote_api_v1.11.md
History View file @ 8c646eb
... ... 
@@ -123,7 +123,6 @@ Create a container
123 123 
              "Cmd":[
124 124 
                      "date"
125 125 
              ],
126 
-             "Dns":null,
127 126 
              "Image":"base",
128 127 
              "Volumes":{
129 128 
                      "/tmp": {}
... ... 
@@ -410,7 +409,9 @@ Start the container `id`
410 410 
              "LxcConf":{"lxc.utsname":"docker"},
411 411 
              "PortBindings":{ "22/tcp": [{ "HostPort": "11022" }] },
412 412 
              "PublishAllPorts":false,
413 
-             "Privileged":false
413 
+             "Privileged":false,
414 
+             "Dns": ["8.8.8.8"],
415 
+             "VolumesFrom": ["parent", "other:ro"]
414 416 
         }
415 417
416 418 
     **Example response**:
docs/sources/reference/api/docker_remote_api_v1.12.md
History View file @ 8c646eb
... ... 
@@ -124,12 +124,10 @@ Create a container
124 124 
              "Cmd":[
125 125 
                      "date"
126 126 
              ],
127 
-             "Dns":null,
128 127 
              "Image":"base",
129 128 
              "Volumes":{
130 129 
                      "/tmp": {}
131 130 
              },
132 
-             "VolumesFrom":"",
133 131 
              "WorkingDir":"",
134 132 
              "DisableNetwork": false,
135 133 
              "ExposedPorts":{
... ... 
@@ -411,7 +409,9 @@ Start the container `id`
411 411 
              "LxcConf":{"lxc.utsname":"docker"},
412 412 
              "PortBindings":{ "22/tcp": [{ "HostPort": "11022" }] },
413 413 
              "PublishAllPorts":false,
414 
-             "Privileged":false
414 
+             "Privileged":false,
415 
+             "Dns": ["8.8.8.8"],
416 
+             "VolumesFrom": ["parent", "other:ro"]
415 417 
         }
416 418
417 419 
     **Example response**: