0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8612 from jfrazelle/8611-ip-masq-iptables

Browse source 
Setting iptables=false should propagate to ip-masq=false
This commit is contained in:
Michael Crosby 2014-10-16 13:35:37 -07:00
commit d1aca045b3
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/daemon.go
View file

@ -731,7 +731,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
return nil, fmt.Errorf("You specified --iptables=false with --icc=false. ICC uses iptables to function. Please set --icc or --iptables to true.")
}
if !config.EnableIptables && config.EnableIpMasq {
return nil, fmt.Errorf("You specified --iptables=false with --ipmasq=true. IP masquerading uses iptables to function. Please set --ipmasq to false or --iptables to true.")
config.EnableIpMasq = false
}
config.DisableNetwork = config.BridgeIface == disableNetworkBridge

10
integration-cli/docker_cli_daemon_test.go
View file

@ -82,3 +82,13 @@ func TestDaemonRestartWithVolumesRefs(t *testing.T) {
logDone("daemon - volume refs are restored")
}
func TestDaemonStartIptablesFalse(t *testing.T) {
d := NewDaemon(t)
if err := d.Start("--iptables=false"); err != nil {
t.Fatalf("we should have been able to start the daemon with passing iptables=false: %v", err)
}
d.Stop()
logDone("daemon - started daemon with iptables=false")
}