Explorar el Código

Merge pull request #6215 from cpuguy83/fix_volumes_from_api_doc

Fixes incorrect API spec for items moved to HostConfig
Sven Dowideit hace 11 años
padre
commit
734d108ed2

+ 1 - 1
docs/sources/reference/api/docker_remote_api_v1.10.md

@@ -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**:

+ 3 - 2
docs/sources/reference/api/docker_remote_api_v1.11.md

@@ -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**:

+ 3 - 3
docs/sources/reference/api/docker_remote_api_v1.12.md

@@ -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**: