starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-25 17:02:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23682 from mrjana/bug

Browse Source 
Check if DriverState is valid before using in convert
Upstream-commit: 83e31c876516313d48e50311cc59f0675087eabb
Component: engine
This commit is contained in:
Tibor Vass
2016-06-17 10:56:40 -07:00
committed by GitHub
parent 82e43b2685 def8da9f42
commit f8e31ac03e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/cluster/convert/network.go
+8 -3
View File
@@ -148,17 +148,22 @@ func BasicNetworkFromGRPC(n swarmapi.Network) basictypes.NetworkResource {
}
}
return basictypes.NetworkResource{
nr := basictypes.NetworkResource{
ID: n.ID,
Name: n.Spec.Annotations.Name,
Scope: "swarm",
Driver: n.DriverState.Name,
EnableIPv6: spec.Ipv6Enabled,
IPAM: ipam,
Internal: spec.Internal,
Options: n.DriverState.Options,
Labels: n.Spec.Annotations.Labels,
}
if n.DriverState != nil {
nr.Driver = n.DriverState.Name
nr.Options = n.DriverState.Options
}
return nr
}
// BasicNetworkCreateToGRPC converts a NetworkCreateRequest to a grpc NetworkSpec.