Переглянути джерело

Tidy driver.go/LinkContainers

Docker-DCO-1.1-Signed-off-by: Ian Bishop <ianbishop@pace7.com> (github: porjo)
Ian Bishop 10 роки тому
батько
коміт
38a595aec5
1 змінених файлів з 1 додано та 5 видалено
  1. 1 5
      daemon/networkdriver/bridge/driver.go

+ 1 - 5
daemon/networkdriver/bridge/driver.go

@@ -509,7 +509,6 @@ func LinkContainers(job *engine.Job) engine.Status {
 		parentIP     = job.Getenv("ParentIP")
 		parentIP     = job.Getenv("ParentIP")
 		ignoreErrors = job.GetenvBool("IgnoreErrors")
 		ignoreErrors = job.GetenvBool("IgnoreErrors")
 		ports        = job.GetenvList("Ports")
 		ports        = job.GetenvList("Ports")
-		chain        = iptables.Chain{}
 	)
 	)
 
 
 	switch action {
 	switch action {
@@ -532,14 +531,11 @@ func LinkContainers(job *engine.Job) engine.Status {
 		return job.Errorf("child IP '%s' is invalid", childIP)
 		return job.Errorf("child IP '%s' is invalid", childIP)
 	}
 	}
 
 
-	chain.Name = "DOCKER"
-	chain.Bridge = bridgeIface
+	chain := iptables.Chain{Name: "DOCKER", Bridge: bridgeIface}
 	for _, p := range ports {
 	for _, p := range ports {
 		port := nat.Port(p)
 		port := nat.Port(p)
 		if err := chain.Link(nfAction, ip1, ip2, port.Int(), port.Proto()); !ignoreErrors && err != nil {
 		if err := chain.Link(nfAction, ip1, ip2, port.Int(), port.Proto()); !ignoreErrors && err != nil {
-			fmt.Print(err)
 			return job.Error(err)
 			return job.Error(err)
-
 		}
 		}
 	}
 	}
 	return engine.StatusOK
 	return engine.StatusOK