Enabling specifying static ip for predefined network on windows

Signed-off-by: msabansal <sabansal@microsoft.com>
Upstream-commit: 1991f6ebd6a5e496d291d96f8bb2aca3f2e9cd0b
Component: engine

components/engine/daemon/container_operations.go

@@ -511,7 +511,7 @@ func (daemon *Daemon) updateNetworkConfig(container *container.Container, idOrNa
 	}
 
 	if !containertypes.NetworkMode(idOrName).IsUserDefined() {
-		if hasUserDefinedIPAddress(endpointConfig) {
+		if hasUserDefinedIPAddress(endpointConfig) && !enableIPOnPredefinedNetwork() {
 			return nil, runconfig.ErrUnsupportedNetworkAndIP
 		}
 		if endpointConfig != nil && len(endpointConfig.Aliases) > 0 {

components/engine/daemon/container_operations_unix.go

@@ -383,3 +383,7 @@ func isLinkable(child *container.Container) bool {
 func errRemovalContainer(containerID string) error {
 	return fmt.Errorf("Container %s is marked for removal and cannot be connected or disconnected to the network", containerID)
 }
+
+func enableIPOnPredefinedNetwork() bool {
+	return false
+}

components/engine/daemon/container_operations_windows.go

@@ -55,3 +55,7 @@ func killProcessDirectly(container *container.Container) error {
 func isLinkable(child *container.Container) bool {
 	return false
 }
+
+func enableIPOnPredefinedNetwork() bool {
+	return true
+}