浏览代码

Extended explanation of NetworkMode's value

* Add network mode `none` to list of possible values for API version 1.15 - 1.23
* For API version 1.21 - 1.23 add explanation that any other value is taken as a custom network's name

Signed-off-by: Roland Huß <roland@jolokia.org>
Roland Huß 9 年之前
父节点
当前提交
c80b36c938

+ 2 - 2
docs/reference/api/docker_remote_api_v1.15.md

@@ -249,7 +249,7 @@ Json Parameters:
           An ever increasing delay (double the previous delay, starting at 100mS)
           An ever increasing delay (double the previous delay, starting at 100mS)
           is added before each restart to prevent flooding the server.
           is added before each restart to prevent flooding the server.
   -   **NetworkMode** - Sets the networking mode for the container. Supported
   -   **NetworkMode** - Sets the networking mode for the container. Supported
-        values are: `bridge`, `host`, and `container:<name|id>`
+        values are: `bridge`, `host`, `none`, and `container:<name|id>`
   -   **Devices** - A list of devices to add to the container specified in the
   -   **Devices** - A list of devices to add to the container specified in the
         form
         form
         `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
         `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
@@ -596,7 +596,7 @@ Json Parameters:
         An ever increasing delay (double the previous delay, starting at 100mS)
         An ever increasing delay (double the previous delay, starting at 100mS)
         is added before each restart to prevent flooding the server.
         is added before each restart to prevent flooding the server.
 -   **NetworkMode** - Sets the networking mode for the container. Supported
 -   **NetworkMode** - Sets the networking mode for the container. Supported
-      values are: `bridge`, `host`, and `container:<name|id>`
+      values are: `bridge`, `host`, `none`, and `container:<name|id>`
 -   **Devices** - A list of devices to add to the container specified in the
 -   **Devices** - A list of devices to add to the container specified in the
       form
       form
       `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
       `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

+ 1 - 1
docs/reference/api/docker_remote_api_v1.16.md

@@ -249,7 +249,7 @@ Json Parameters:
           An ever increasing delay (double the previous delay, starting at 100mS)
           An ever increasing delay (double the previous delay, starting at 100mS)
           is added before each restart to prevent flooding the server.
           is added before each restart to prevent flooding the server.
   -   **NetworkMode** - Sets the networking mode for the container. Supported
   -   **NetworkMode** - Sets the networking mode for the container. Supported
-        values are: `bridge`, `host`, and `container:<name|id>`
+        values are: `bridge`, `host`, `none`, and `container:<name|id>`
   -   **Devices** - A list of devices to add to the container specified in the
   -   **Devices** - A list of devices to add to the container specified in the
         form
         form
         `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
         `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

+ 1 - 1
docs/reference/api/docker_remote_api_v1.17.md

@@ -251,7 +251,7 @@ Json Parameters:
           An ever increasing delay (double the previous delay, starting at 100mS)
           An ever increasing delay (double the previous delay, starting at 100mS)
           is added before each restart to prevent flooding the server.
           is added before each restart to prevent flooding the server.
   -   **NetworkMode** - Sets the networking mode for the container. Supported
   -   **NetworkMode** - Sets the networking mode for the container. Supported
-        values are: `bridge`, `host`, and `container:<name|id>`
+        values are: `bridge`, `host`, `none`, and `container:<name|id>`
   -   **Devices** - A list of devices to add to the container specified in the
   -   **Devices** - A list of devices to add to the container specified in the
         form
         form
         `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
         `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

+ 1 - 1
docs/reference/api/docker_remote_api_v1.18.md

@@ -270,7 +270,7 @@ Json Parameters:
             An ever increasing delay (double the previous delay, starting at 100mS)
             An ever increasing delay (double the previous delay, starting at 100mS)
             is added before each restart to prevent flooding the server.
             is added before each restart to prevent flooding the server.
     -   **NetworkMode** - Sets the networking mode for the container. Supported
     -   **NetworkMode** - Sets the networking mode for the container. Supported
-          values are: `bridge`, `host`, and `container:<name|id>`
+          values are: `bridge`, `host`, `none`, and `container:<name|id>`
     -   **Devices** - A list of devices to add to the container specified in the
     -   **Devices** - A list of devices to add to the container specified in the
           form
           form
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

+ 1 - 1
docs/reference/api/docker_remote_api_v1.19.md

@@ -281,7 +281,7 @@ Json Parameters:
             An ever increasing delay (double the previous delay, starting at 100mS)
             An ever increasing delay (double the previous delay, starting at 100mS)
             is added before each restart to prevent flooding the server.
             is added before each restart to prevent flooding the server.
     -   **NetworkMode** - Sets the networking mode for the container. Supported
     -   **NetworkMode** - Sets the networking mode for the container. Supported
-          values are: `bridge`, `host`, and `container:<name|id>`
+          values are: `bridge`, `host`, `none`, and `container:<name|id>`
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
       form
       form
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

+ 1 - 1
docs/reference/api/docker_remote_api_v1.20.md

@@ -289,7 +289,7 @@ Json Parameters:
             An ever increasing delay (double the previous delay, starting at 100mS)
             An ever increasing delay (double the previous delay, starting at 100mS)
             is added before each restart to prevent flooding the server.
             is added before each restart to prevent flooding the server.
     -   **NetworkMode** - Sets the networking mode for the container. Supported
     -   **NetworkMode** - Sets the networking mode for the container. Supported
-          values are: `bridge`, `host`, and `container:<name|id>`
+          values are: `bridge`, `host`, `none`, and `container:<name|id>`
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
       form
       form
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

+ 2 - 1
docs/reference/api/docker_remote_api_v1.21.md

@@ -305,7 +305,8 @@ Json Parameters:
             An ever increasing delay (double the previous delay, starting at 100mS)
             An ever increasing delay (double the previous delay, starting at 100mS)
             is added before each restart to prevent flooding the server.
             is added before each restart to prevent flooding the server.
     -   **NetworkMode** - Sets the networking mode for the container. Supported
     -   **NetworkMode** - Sets the networking mode for the container. Supported
-          values are: `bridge`, `host`, and `container:<name|id>`
+          standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken
+          as a custom network's name to which this container should connect to.
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
       form
       form
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

+ 2 - 1
docs/reference/api/docker_remote_api_v1.22.md

@@ -386,7 +386,8 @@ Json Parameters:
             An ever increasing delay (double the previous delay, starting at 100mS)
             An ever increasing delay (double the previous delay, starting at 100mS)
             is added before each restart to prevent flooding the server.
             is added before each restart to prevent flooding the server.
     -   **NetworkMode** - Sets the networking mode for the container. Supported
     -   **NetworkMode** - Sets the networking mode for the container. Supported
-          values are: `bridge`, `host`, and `container:<name|id>`
+          standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken
+          as a custom network's name to which this container should connect to.
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
       form
       form
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`

+ 2 - 1
docs/reference/api/docker_remote_api_v1.23.md

@@ -390,7 +390,8 @@ Json Parameters:
             An ever increasing delay (double the previous delay, starting at 100mS)
             An ever increasing delay (double the previous delay, starting at 100mS)
             is added before each restart to prevent flooding the server.
             is added before each restart to prevent flooding the server.
     -   **NetworkMode** - Sets the networking mode for the container. Supported
     -   **NetworkMode** - Sets the networking mode for the container. Supported
-          values are: `bridge`, `host`, and `container:<name|id>`
+          standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken
+          as a custom network's name to which this container should connect to.
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
       form
       form
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`