Merge pull request #65 from seemethere/cherry_pick_33609

Merge pull request #29418 from aboch/p66
docker-archive · Jun 12, 2017 · da2d17a · da2d17a
2 parents 514d89f + 091732e
commit da2d17a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/components/engine/api/server/router/network/network_routes.go b/components/engine/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()