Merge pull request #30325 from dnephin/add-internal-to-compose-network

Add network.internal to Compose schema
This commit is contained in:
Victor Vieux 2017-01-24 17:16:08 -08:00 committed by GitHub
commit 4726fd1203
3 changed files with 6 additions and 3 deletions

View file

@ -58,9 +58,10 @@ func Networks(namespace Namespace, networks networkMap, servicesNetworks map[str
}
createOpts := types.NetworkCreate{
Labels: AddStackLabel(namespace, network.Labels),
Driver: network.Driver,
Options: network.DriverOpts,
Labels: AddStackLabel(namespace, network.Labels),
Driver: network.Driver,
Options: network.DriverOpts,
Internal: network.Internal,
}
if network.Ipam.Driver != "" || len(network.Ipam.Config) > 0 {

View file

@ -308,6 +308,7 @@
},
"additionalProperties": false
},
"internal": {"type": "boolean"},
"labels": {"$ref": "#/definitions/list_or_dict"}
},
"additionalProperties": false

View file

@ -204,6 +204,7 @@ type NetworkConfig struct {
DriverOpts map[string]string `mapstructure:"driver_opts"`
Ipam IPAMConfig
External External
Internal bool
Labels map[string]string `compose:"list_or_dict_equals"`
}