فهرست منبع

Fix sending []byte in job env

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Michael Crosby 11 سال پیش
والد
کامیت
2d8709696c
3فایلهای تغییر یافته به همراه6 افزوده شده و 4 حذف شده
  1. 0 1
      container.go
  2. 5 3
      networkdriver/lxc/driver.go
  3. 1 0
      runtime.go

+ 0 - 1
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
 }

+ 5 - 3
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()

+ 1 - 0
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