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

Browse source 
Static ip support for windows
This commit is contained in:
Alessandro Boch 2016-04-29 12:09:09 -07:00
commit 57a91d9153
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libnetwork/drivers/windows/windows.go
View file

@ -417,6 +417,10 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
} }
endpointStruct.Policies = append(endpointStruct.Policies, qosPolicies...) endpointStruct.Policies = append(endpointStruct.Policies, qosPolicies...)
if ifInfo.Address() != nil {
endpointStruct.IPAddress = ifInfo.Address().IP
}
configurationb, err := json.Marshal(endpointStruct) configurationb, err := json.Marshal(endpointStruct)
if err != nil { if err != nil {
return err return err
@ -452,8 +456,13 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
n.endpoints[eid] = endpoint n.endpoints[eid] = endpoint
n.Unlock() n.Unlock()
ifInfo.SetIPAddress(endpoint.addr) if ifInfo.Address() == nil {
ifInfo.SetMacAddress(endpoint.macAddress) ifInfo.SetIPAddress(endpoint.addr)
}
if macAddress == nil {
ifInfo.SetMacAddress(endpoint.macAddress)
}
return nil return nil
} }