Merge pull request #30952 from yongtang/02122017-swagger-attachable

Add `attachable` for network object in swagger api docs
(cherry picked from commit 0464441fb1)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Brian Goff 2017-02-14 15:53:52 -05:00 committed by Sebastiaan van Stijn
parent 9dcb36dfa2
commit 740fbef836

View file

@ -1066,6 +1066,8 @@ definitions:
$ref: "#/definitions/IPAM"
Internal:
type: "boolean"
Attachable:
type: "boolean"
Containers:
type: "object"
additionalProperties:
@ -1093,6 +1095,7 @@ definitions:
Options:
foo: "bar"
Internal: false
Attachable: false
Containers:
19a4d5d687db25203351ed79d478946f861258f018fe384f229f2efa4b23513c:
Name: "test"
@ -6012,6 +6015,7 @@ paths:
Driver: "bridge"
EnableIPv6: false
Internal: false
Attachable: false
IPAM:
Driver: "default"
Config:
@ -6037,6 +6041,7 @@ paths:
Driver: "null"
EnableIPv6: false
Internal: false
Attachable: false
IPAM:
Driver: "default"
Config: []
@ -6049,6 +6054,7 @@ paths:
Driver: "host"
EnableIPv6: false
Internal: false
Attachable: false
IPAM:
Driver: "default"
Config: []
@ -6173,6 +6179,9 @@ paths:
Internal:
description: "Restrict external access to the network."
type: "boolean"
Attachable:
description: "Globally scoped network is manually attachable by regular containers from workers in swarm mode."
type: "boolean"
IPAM:
description: "Optional custom IP scheme for the network."
$ref: "#/definitions/IPAM"
@ -6205,6 +6214,7 @@ paths:
Options:
foo: "bar"
Internal: true
Attachable: false
Options:
com.docker.network.bridge.default_bridge: "true"
com.docker.network.bridge.enable_icc: "true"