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

Merge pull request #1916 from msabansal/fixcidr

Browse source 
Docker deamon doesn't work with --fixed-cidr on windows
This commit is contained in:
Flavio Crisciani 2017-12-08 11:25:58 -08:00 • committed by GitHub
commit 3e99131f55
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libnetwork/ipams/windowsipam/windowsipam.go
View file

@ -5,7 +5,6 @@ import (
"github.com/docker/libnetwork/discoverapi" "github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/ipamapi" "github.com/docker/libnetwork/ipamapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types" "github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -75,15 +74,11 @@ func (a *allocator) RequestAddress(poolID string, prefAddress net.IP, opts map[s
return nil, nil, err return nil, nil, err
} }
// TODO Windows: Remove this once the bug in docker daemon is fixed
// that causes it to throw an exception on nil gateway
if prefAddress != nil { if prefAddress != nil {
return &net.IPNet{IP: prefAddress, Mask: ipNet.Mask}, nil, nil return &net.IPNet{IP: prefAddress, Mask: ipNet.Mask}, nil, nil
} else if opts[ipamapi.RequestAddressType] == netlabel.Gateway {
return ipNet, nil, nil
} else {
return nil, nil, nil
} }
return nil, nil, nil
} }
// ReleaseAddress releases the address - always succeeds // ReleaseAddress releases the address - always succeeds