From 5ab9b5e6a9f7d806b0035b6b8a44c3ed9ee49e5b Mon Sep 17 00:00:00 2001 From: Sandeep Bansal Date: Fri, 18 Aug 2017 12:13:30 -0700 Subject: [PATCH] Docker deamon doesn't work with --fixed-cidr on windows Signed-off-by: Sandeep Bansal --- libnetwork/ipams/windowsipam/windowsipam.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libnetwork/ipams/windowsipam/windowsipam.go b/libnetwork/ipams/windowsipam/windowsipam.go index 9cf99d42b1..5c7b1f5411 100644 --- a/libnetwork/ipams/windowsipam/windowsipam.go +++ b/libnetwork/ipams/windowsipam/windowsipam.go @@ -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