diff --git a/container.go b/container.go index 0e7fd257af..365ff93c69 100644 --- a/container.go +++ b/container.go @@ -1212,7 +1212,6 @@ func (container *Container) allocateNetwork() error { container.NetworkSettings.IPAddress = env.Get("IP") container.NetworkSettings.IPPrefixLen = env.GetInt("IPPrefixLen") container.NetworkSettings.Gateway = env.Get("Gateway") - fmt.Printf("\n-----> %#v\n", container.NetworkSettings) return nil } diff --git a/networkdriver/lxc/driver.go b/networkdriver/lxc/driver.go index 542b4b8504..deb09621ba 100644 --- a/networkdriver/lxc/driver.go +++ b/networkdriver/lxc/driver.go @@ -71,6 +71,8 @@ func InitDriver(job *engine.Job) engine.Status { bridgeIP = job.Getenv("BridgeIP") ) + defaultBindingIP = net.ParseIP(job.Getenv("DefaultBindingIP")) + bridgeIface = job.Getenv("BridgeIface") if bridgeIface == "" { bridgeIface = DefaultNetworkBridge @@ -311,9 +313,9 @@ func Allocate(job *engine.Job) engine.Status { } out := engine.Env{} - out.Set("IP", string(*ip)) - out.Set("Mask", string(bridgeNetwork.Mask)) - out.Set("Gateway", string(bridgeNetwork.IP)) + out.Set("IP", ip.String()) + out.Set("Mask", bridgeNetwork.Mask.String()) + out.Set("Gateway", bridgeNetwork.IP.String()) out.Set("Bridge", bridgeIface) size, _ := bridgeNetwork.Mask.Size() diff --git a/runtime.go b/runtime.go index 475e32ed5f..d03db3d068 100644 --- a/runtime.go +++ b/runtime.go @@ -674,6 +674,7 @@ func NewRuntimeFromDirectory(config *DaemonConfig, eng *engine.Engine) (*Runtime job.SetenvBool("EnableIpForward", config.EnableIpForward) job.Setenv("BridgeIface", config.BridgeIface) job.Setenv("BridgeIP", config.BridgeIP) + job.Setenv("DefaultBindingIP", config.DefaultIp.String()) if err := job.Run(); err != nil { return nil, err