Merge pull request #6651 from erikh/6002-conflicting-iptables-options

Add mutex warning when specifying -icc or -ip-forward and -iptables=false

docker/docker.go

@@ -95,6 +95,10 @@ func main() {
 		log.Fatal("You specified -b & --bip, mutually exclusive options. Please specify only one.")
 	}
 
+	if !*flEnableIptables && !*flInterContainerComm {
+		log.Fatal("You specified --iptables=false with --icc=false. ICC uses iptables to function. Please set --icc or --iptables to true.")
+	}
+
 	if *flDebug {
 		os.Setenv("DEBUG", "1")
 	}