Merge pull request #33609 from thaJeztah/backport-29418

backport #29418 "Fix buildIpamResources()" to master
2017-06-09 19:18:50 +02:00 · 2017-06-09 19:18:50 +02:00 · c9f26eaaf8
commit c9f26eaaf8
parent 4721844811 27498a3c60
1 changed files with 3 additions and 0 deletions
--- a/api/server/router/network/network_routes.go
+++ b/api/server/router/network/network_routes.go
@ -410,6 +410,9 @@ func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo)

 	if !hasIpv6Conf {
 		for _, ip6Info := range ipv6Info {
+			if ip6Info.IPAMData.Pool == nil {
+				continue
+			}
 			iData := network.IPAMConfig{}
 			iData.Subnet = ip6Info.IPAMData.Pool.String()
 			iData.Gateway = ip6Info.IPAMData.Gateway.String()