toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vendor swarmkit 7e096ced

Browse Source 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 10df99f9ae48acc9888494223256637a8ca06f50
Component: engine
This commit is contained in:
Aaron Lehmann
2017-05-23 15:01:35 -07:00
parent c70c1ec6df
commit 5556f64d13
7 changed files with 297 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/cluster/convert/network.go
+7 -5
View File
@@ -36,9 +36,9 @@ func networkFromGRPC(n *swarmapi.Network) types.Network {
IPAMOptions: ipamFromGRPC(n.IPAM),
}
if n.Spec.ConfigFrom != "" {
if n.Spec.GetNetwork() != "" {
network.Spec.ConfigFrom = &networktypes.ConfigReference{
Network: n.Spec.ConfigFrom,
Network: n.Spec.GetNetwork(),
}
}
@@ -169,9 +169,9 @@ func BasicNetworkFromGRPC(n swarmapi.Network) basictypes.NetworkResource {
Labels: n.Spec.Annotations.Labels,
}
if n.Spec.ConfigFrom != "" {
if n.Spec.GetNetwork() != "" {
nr.ConfigFrom = networktypes.ConfigReference{
Network: n.Spec.ConfigFrom,
Network: n.Spec.GetNetwork(),
}
}
@@ -221,7 +221,9 @@ func BasicNetworkCreateToGRPC(create basictypes.NetworkCreateRequest) swarmapi.N
ns.IPAM.Configs = ipamSpec
}
if create.ConfigFrom != nil {
ns.ConfigFrom = create.ConfigFrom.Network
ns.ConfigFrom = &swarmapi.NetworkSpec_Network{
Network: create.ConfigFrom.Network,
}
}
return ns
}
components/engine/daemon/cluster/executor/container/container.go
+2 -2
View File
@@ -597,9 +597,9 @@ func (c *containerConfig) networkCreateRequest(name string) (clustertypes.Networ
Scope: netconst.SwarmScope,
}
if na.Network.Spec.ConfigFrom != "" {
if na.Network.Spec.GetNetwork() != "" {
options.ConfigFrom = &network.ConfigReference{
Network: na.Network.Spec.ConfigFrom,
Network: na.Network.Spec.GetNetwork(),
}
}