Added ip6tables config option Signed-off-by: Benjamin Böhmke <benjamin@boehmke.net>
diff --git a/cmd/dockerd/config_unix.go b/cmd/dockerd/config_unix.go index ec41714..50c89c4 100644 --- a/cmd/dockerd/config_unix.go +++ b/cmd/dockerd/config_unix.go
@@ -34,6 +34,7 @@ flags.BoolVar(&conf.EnableSelinuxSupport, "selinux-enabled", false, "Enable selinux support") flags.Var(opts.NewNamedUlimitOpt("default-ulimits", &conf.Ulimits), "default-ulimit", "Default ulimits for containers") flags.BoolVar(&conf.BridgeConfig.EnableIPTables, "iptables", true, "Enable addition of iptables rules") + flags.BoolVar(&conf.BridgeConfig.EnableIP6Tables, "ip6tables", false, "Enable addition of ip6tables rules") flags.BoolVar(&conf.BridgeConfig.EnableIPForward, "ip-forward", true, "Enable net.ipv4.ip_forward") flags.BoolVar(&conf.BridgeConfig.EnableIPMasq, "ip-masq", true, "Enable IP masquerading") flags.BoolVar(&conf.BridgeConfig.EnableIPv6, "ipv6", false, "Enable IPv6 networking")
diff --git a/daemon/config/config_unix.go b/daemon/config/config_unix.go index 343b85f..4a32f55 100644 --- a/daemon/config/config_unix.go +++ b/daemon/config/config_unix.go
@@ -54,6 +54,7 @@ // Fields below here are platform specific. EnableIPv6 bool `json:"ipv6,omitempty"` EnableIPTables bool `json:"iptables,omitempty"` + EnableIP6Tables bool `json:"ip6tables,omitempty"` EnableIPForward bool `json:"ip-forward,omitempty"` EnableIPMasq bool `json:"ip-masq,omitempty"` EnableUserlandProxy bool `json:"userland-proxy,omitempty"`
diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 2e4bbd6..0d96787 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go
@@ -911,6 +911,7 @@ bridgeConfig := options.Generic{ "EnableIPForwarding": config.BridgeConfig.EnableIPForward, "EnableIPTables": config.BridgeConfig.EnableIPTables, + "EnableIP6Tables": config.BridgeConfig.EnableIP6Tables, "EnableUserlandProxy": config.BridgeConfig.EnableUserlandProxy, "UserlandProxyPath": config.BridgeConfig.UserlandProxyPath} bridgeOption := options.Generic{netlabel.GenericData: bridgeConfig}