From d0893cb64b3dbff27e5ae406577981377dfeb8ce Mon Sep 17 00:00:00 2001 From: Ian Bishop Date: Sun, 21 Dec 2014 13:42:02 +1000 Subject: [PATCH] Tidy driver.go/LinkContainers Docker-DCO-1.1-Signed-off-by: Ian Bishop (github: porjo) Upstream-commit: 38a595aec561b8a7b4325b6c1c4efd1b0b8e89c0 Component: engine --- components/engine/daemon/networkdriver/bridge/driver.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/components/engine/daemon/networkdriver/bridge/driver.go b/components/engine/daemon/networkdriver/bridge/driver.go index 228bd479f6..81624ad1db 100644 --- a/components/engine/daemon/networkdriver/bridge/driver.go +++ b/components/engine/daemon/networkdriver/bridge/driver.go @@ -509,7 +509,6 @@ func LinkContainers(job *engine.Job) engine.Status { parentIP = job.Getenv("ParentIP") ignoreErrors = job.GetenvBool("IgnoreErrors") ports = job.GetenvList("Ports") - chain = iptables.Chain{} ) switch action { @@ -532,14 +531,11 @@ func LinkContainers(job *engine.Job) engine.Status { 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 { port := nat.Port(p) if err := chain.Link(nfAction, ip1, ip2, port.Int(), port.Proto()); !ignoreErrors && err != nil { - fmt.Print(err) return job.Error(err) - } } return engine.StatusOK