From c32ef60c4be3bd982c970df85a8dd2588a55e464 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Tue, 16 Jun 2015 09:00:55 -0700 Subject: [PATCH] Cleaning up iptables nat table on driver bootup This is required to have consistent behaviour as in 1.6.2. Signed-off-by: Madhu Venugopal Conflicts: drivers/bridge/bridge.go --- drivers/bridge/bridge.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/bridge/bridge.go b/drivers/bridge/bridge.go index ccdf204..a0a3987 100644 --- a/drivers/bridge/bridge.go +++ b/drivers/bridge/bridge.go @@ -10,6 +10,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/driverapi" "github.com/docker/libnetwork/ipallocator" + "github.com/docker/libnetwork/iptables" "github.com/docker/libnetwork/netlabel" "github.com/docker/libnetwork/netutils" "github.com/docker/libnetwork/options" @@ -109,6 +110,9 @@ func Init(dc driverapi.DriverCallback) error { if out, err := exec.Command("modprobe", "-va", "bridge", "nf_nat", "br_netfilter").Output(); err != nil { logrus.Warnf("Running modprobe bridge nf_nat failed with message: %s, error: %v", out, err) } + if err := iptables.RemoveExistingChain(DockerChain, iptables.Nat); err != nil { + logrus.Warnf("Failed to remove existing iptables entries in %s : %v", DockerChain, err) + } return dc.RegisterDriver(networkType, newDriver()) }