centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 08:18:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17186 from LK4D4/icc_clear

Browse Source 
Use more clear message for icc=false + iptables=false
This commit is contained in:
Jess Frazelle
2015-10-19 15:40:41 -07:00
parent c766bcdc73 ab495ab0d0
commit b135f758d7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/daemon_unix.go
View File

@@ -245,7 +245,7 @@ func checkConfigOptions(config *Config) error {
return fmt.Errorf("You specified -b & --bip, mutually exclusive options. Please specify only one.")
}
if !config.Bridge.EnableIPTables && !config.Bridge.InterContainerCommunication {
return fmt.Errorf("You specified --iptables=false with --icc=false. ICC uses iptables to function. Please set --icc or --iptables to true.")
return fmt.Errorf("You specified --iptables=false with --icc=false. ICC=false uses iptables to function. Please set --icc or --iptables to true.")
}
if !config.Bridge.EnableIPTables && config.Bridge.EnableIPMasq {
config.Bridge.EnableIPMasq = false