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 #22208 from msabansal/staticip

Browse source 
Enabling specifying static ip for predefined network on windows
This commit is contained in:
Michael Crosby 2016-08-12 11:39:25 -07:00 committed by GitHub
commit 5632768a0f
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/container_operations.go
View file

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

4
daemon/container_operations_unix.go
View file

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

4
daemon/container_operations_windows.go
View file

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