0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Docker deamon doesn't work with --fixed-cidr on windows

Browse source 
Signed-off-by: Sandeep Bansal <sabansal@microsoft.com>
This commit is contained in:
Sandeep Bansal 2017-08-18 12:13:30 -07:00
parent 07354ab656
commit 5ab9b5e6a9
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/ipamapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
@ -75,15 +74,11 @@ func (a *allocator) RequestAddress(poolID string, prefAddress net.IP, opts map[s
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 {
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