Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 70e2585d545e18757222b8ccfb21514fde7c42f4)
... | ... |
@@ -65,7 +65,7 @@ clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837 |
65 | 65 |
clone git github.com/imdario/mergo 0.2.1 |
66 | 66 |
|
67 | 67 |
#get libnetwork packages |
68 |
-clone git github.com/docker/libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed |
|
68 |
+clone git github.com/docker/libnetwork 13be89d1cf79760acae842a32ad8531567220286 |
|
69 | 69 |
clone git github.com/docker/go-events 39718a26497694185f8fb58a7d6f31947f3dc42d |
70 | 70 |
clone git github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 |
71 | 71 |
clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec |
... | ... |
@@ -436,8 +436,8 @@ func programIngress(gwIP net.IP, ingressPorts []*PortConfig, isDelete bool) erro |
436 | 436 |
} |
437 | 437 |
|
438 | 438 |
for _, chain := range []string{"OUTPUT", "PREROUTING"} { |
439 |
- if !iptables.Exists(iptables.Nat, chain, "-j", ingressChain) { |
|
440 |
- if err := iptables.RawCombinedOutput("-t", "nat", "-I", chain, "-j", ingressChain); err != nil { |
|
439 |
+ if !iptables.Exists(iptables.Nat, chain, "-m", "addrtype", "--dst-type", "LOCAL", "-j", ingressChain) { |
|
440 |
+ if err := iptables.RawCombinedOutput("-t", "nat", "-I", chain, "-m", "addrtype", "--dst-type", "LOCAL", "-j", ingressChain); err != nil { |
|
441 | 441 |
return fmt.Errorf("failed to add jump rule in %s to ingress chain: %v", chain, err) |
442 | 442 |
} |
443 | 443 |
} |