mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Exclude loopback-to-loopback connections from DNAT rules, to allow userland proxying
This commit is contained in:
parent
931ca464a7
commit
61259ab4b4
1 changed files with 3 additions and 2 deletions
|
@ -188,7 +188,8 @@ type PortMapper struct {
|
||||||
func (mapper *PortMapper) cleanup() error {
|
func (mapper *PortMapper) cleanup() error {
|
||||||
// Ignore errors - This could mean the chains were never set up
|
// Ignore errors - This could mean the chains were never set up
|
||||||
iptables("-t", "nat", "-D", "PREROUTING", "-m", "addrtype", "--dst-type", "LOCAL", "-j", "DOCKER")
|
iptables("-t", "nat", "-D", "PREROUTING", "-m", "addrtype", "--dst-type", "LOCAL", "-j", "DOCKER")
|
||||||
iptables("-t", "nat", "-D", "OUTPUT", "-m", "addrtype", "--dst-type", "LOCAL", "-j", "DOCKER")
|
iptables("-t", "nat", "-D", "OUTPUT", "-m", "addrtype", "--dst-type", "LOCAL", "!", "--dst", "127.0.0.0/8", "-j", "DOCKER")
|
||||||
|
iptables("-t", "nat", "-D", "OUTPUT", "-m", "addrtype", "--dst-type", "LOCAL", "-j", "DOCKER") // Created in versions <= 0.1.6
|
||||||
// Also cleanup rules created by older versions, or -X might fail.
|
// Also cleanup rules created by older versions, or -X might fail.
|
||||||
iptables("-t", "nat", "-D", "PREROUTING", "-j", "DOCKER")
|
iptables("-t", "nat", "-D", "PREROUTING", "-j", "DOCKER")
|
||||||
iptables("-t", "nat", "-D", "OUTPUT", "-j", "DOCKER")
|
iptables("-t", "nat", "-D", "OUTPUT", "-j", "DOCKER")
|
||||||
|
@ -205,7 +206,7 @@ func (mapper *PortMapper) setup() error {
|
||||||
if err := iptables("-t", "nat", "-A", "PREROUTING", "-m", "addrtype", "--dst-type", "LOCAL", "-j", "DOCKER"); err != nil {
|
if err := iptables("-t", "nat", "-A", "PREROUTING", "-m", "addrtype", "--dst-type", "LOCAL", "-j", "DOCKER"); err != nil {
|
||||||
return fmt.Errorf("Failed to inject docker in PREROUTING chain: %s", err)
|
return fmt.Errorf("Failed to inject docker in PREROUTING chain: %s", err)
|
||||||
}
|
}
|
||||||
if err := iptables("-t", "nat", "-A", "OUTPUT", "-m", "addrtype", "--dst-type", "LOCAL", "-j", "DOCKER"); err != nil {
|
if err := iptables("-t", "nat", "-A", "OUTPUT", "-m", "addrtype", "--dst-type", "LOCAL", "!", "--dst", "127.0.0.0/8", "-j", "DOCKER"); err != nil {
|
||||||
return fmt.Errorf("Failed to inject docker in OUTPUT chain: %s", err)
|
return fmt.Errorf("Failed to inject docker in OUTPUT chain: %s", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|
Loading…
Reference in a new issue