1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Fix buildIpamResources()

- Can no longer assume IPv6 operational data to be present

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2016-12-14 09:27:56 -08:00
parent 89c27499da
commit fa9618550a

View file

@ -259,6 +259,9 @@ func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo)
if !hasIpv6Conf { if !hasIpv6Conf {
for _, ip6Info := range ipv6Info { for _, ip6Info := range ipv6Info {
if ip6Info.IPAMData.Pool == nil {
continue
}
iData := network.IPAMConfig{} iData := network.IPAMConfig{}
iData.Subnet = ip6Info.IPAMData.Pool.String() iData.Subnet = ip6Info.IPAMData.Pool.String()
iData.Gateway = ip6Info.IPAMData.Gateway.String() iData.Gateway = ip6Info.IPAMData.Gateway.String()