Explorar o código

Update /containers/create remote API docs

- Show how to pass the networking config in POST containers/create body

Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 30859c34569b900d3d798ad55f48f3d4fd7dc32c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Alessandro Boch %!s(int64=9) %!d(string=hai) anos
pai
achega
5618fbf18c

+ 22 - 5
docs/reference/api/docker_remote_api_v1.22.md

@@ -298,6 +298,17 @@ Create a container
              "CgroupParent": "",
              "CgroupParent": "",
              "VolumeDriver": "",
              "VolumeDriver": "",
              "ShmSize": 67108864
              "ShmSize": 67108864
+          },
+          "NetworkingConfig": {
+          "EndpointsConfig": {
+              "isolated_nw" : {
+                  "IPAMConfig": {
+                      "IPv4Address":"172.20.30.33",
+                      "IPv6Address":"2001:db8:abcd::3033"
+                  },
+                  "Links":["container_1", "container_2"],
+                  "Aliases":["server_x", "server_y"]
+              }
           }
           }
       }
       }
 
 
@@ -2952,11 +2963,17 @@ Content-Type: application/json
   "Name":"isolated_nw",
   "Name":"isolated_nw",
   "Driver":"bridge",
   "Driver":"bridge",
   "IPAM":{
   "IPAM":{
-    "Config":[{
-      "Subnet":"172.20.0.0/16",
-      "IPRange":"172.20.10.0/24",
-      "Gateway":"172.20.10.11"
-    }],
+    "Config":[
+       {
+          "Subnet":"172.20.0.0/16",
+          "IPRange":"172.20.10.0/24",
+          "Gateway":"172.20.10.11"
+        },
+        {
+          "Subnet":"2001:db8:abcd::/64",
+          "Gateway":"2001:db8:abcd::1011"
+        }
+    ],
     "Options": {
     "Options": {
         "foo": "bar"
         "foo": "bar"
     }
     }

+ 23 - 6
docs/reference/api/docker_remote_api_v1.23.md

@@ -317,6 +317,17 @@ Create a container
              "CgroupParent": "",
              "CgroupParent": "",
              "VolumeDriver": "",
              "VolumeDriver": "",
              "ShmSize": 67108864
              "ShmSize": 67108864
+          },
+          "NetworkingConfig": {
+          "EndpointsConfig": {
+              "isolated_nw" : {
+                  "IPAMConfig": {
+                      "IPv4Address":"172.20.30.33",
+                      "IPv6Address":"2001:db8:abcd::3033"
+                  },
+                  "Links":["container_1", "container_2"],
+                  "Aliases":["server_x", "server_y"]
+              }
           }
           }
       }
       }
 
 
@@ -3002,13 +3013,19 @@ Content-Type: application/json
 {
 {
   "Name":"isolated_nw",
   "Name":"isolated_nw",
   "Driver":"bridge",
   "Driver":"bridge",
-  "EnableIPv6": false,
+  "EnableIPv6": true,
   "IPAM":{
   "IPAM":{
-    "Config":[{
-      "Subnet":"172.20.0.0/16",
-      "IPRange":"172.20.10.0/24",
-      "Gateway":"172.20.10.11"
-    }],
+    "Config":[
+       {
+          "Subnet":"172.20.0.0/16",
+          "IPRange":"172.20.10.0/24",
+          "Gateway":"172.20.10.11"
+        },
+        {
+          "Subnet":"2001:db8:abcd::/64",
+          "Gateway":"2001:db8:abcd::1011"
+        }
+    ],
     "Options": {
     "Options": {
         "foo": "bar"
         "foo": "bar"
     }
     }

+ 2 - 0
docs/userguide/networking/default_network/container-communication.md

@@ -59,6 +59,8 @@ could be added:
 $ iptables -I DOCKER -i ext_if ! -s 8.8.8.8 -j DROP
 $ iptables -I DOCKER -i ext_if ! -s 8.8.8.8 -j DROP
 ```
 ```
 
 
+where *ext_if* is the name of the interface providing external connectivity to the host.
+
 ##  Communication between containers
 ##  Communication between containers
 
 
 Whether two containers can communicate is governed, at the operating system level, by two factors.
 Whether two containers can communicate is governed, at the operating system level, by two factors.