toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6101 from LK4D4/ip_range_#4986

Browse Source 
Implement allocating IPs from CIDR within bridge network 
Upstream-commit: 9fb34ae5710faaadc730a7005f785cefc56eed4b
Component: engine
This commit is contained in:
unclejack
2014-09-22 17:09:16 +03:00
parent 4420332c09 2508e0d078
commit eb02e608df
8 changed files with 202 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/engine/daemon/daemon.go
View File

@ -821,6 +821,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
job.SetenvBool("EnableIpMasq", config.EnableIpMasq)
job.Setenv("BridgeIface", config.BridgeIface)
job.Setenv("BridgeIP", config.BridgeIP)
job.Setenv("FixedCIDR", config.FixedCIDR)
job.Setenv("DefaultBindingIP", config.DefaultIp.String())
if err := job.Run(); err != nil {