Signed-off-by: Benjamin Böhmke <benjamin@boehmke.net>
| ... | ... |
@@ -34,6 +34,7 @@ func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) error {
|
| 34 | 34 |
flags.BoolVar(&conf.EnableSelinuxSupport, "selinux-enabled", false, "Enable selinux support") |
| 35 | 35 |
flags.Var(opts.NewNamedUlimitOpt("default-ulimits", &conf.Ulimits), "default-ulimit", "Default ulimits for containers")
|
| 36 | 36 |
flags.BoolVar(&conf.BridgeConfig.EnableIPTables, "iptables", true, "Enable addition of iptables rules") |
| 37 |
+ flags.BoolVar(&conf.BridgeConfig.EnableIP6Tables, "ip6tables", false, "Enable addition of ip6tables rules") |
|
| 37 | 38 |
flags.BoolVar(&conf.BridgeConfig.EnableIPForward, "ip-forward", true, "Enable net.ipv4.ip_forward") |
| 38 | 39 |
flags.BoolVar(&conf.BridgeConfig.EnableIPMasq, "ip-masq", true, "Enable IP masquerading") |
| 39 | 40 |
flags.BoolVar(&conf.BridgeConfig.EnableIPv6, "ipv6", false, "Enable IPv6 networking") |
| ... | ... |
@@ -54,6 +54,7 @@ type BridgeConfig struct {
|
| 54 | 54 |
// Fields below here are platform specific. |
| 55 | 55 |
EnableIPv6 bool `json:"ipv6,omitempty"` |
| 56 | 56 |
EnableIPTables bool `json:"iptables,omitempty"` |
| 57 |
+ EnableIP6Tables bool `json:"ip6tables,omitempty"` |
|
| 57 | 58 |
EnableIPForward bool `json:"ip-forward,omitempty"` |
| 58 | 59 |
EnableIPMasq bool `json:"ip-masq,omitempty"` |
| 59 | 60 |
EnableUserlandProxy bool `json:"userland-proxy,omitempty"` |
| ... | ... |
@@ -911,6 +911,7 @@ func driverOptions(config *config.Config) []nwconfig.Option {
|
| 911 | 911 |
bridgeConfig := options.Generic{
|
| 912 | 912 |
"EnableIPForwarding": config.BridgeConfig.EnableIPForward, |
| 913 | 913 |
"EnableIPTables": config.BridgeConfig.EnableIPTables, |
| 914 |
+ "EnableIP6Tables": config.BridgeConfig.EnableIP6Tables, |
|
| 914 | 915 |
"EnableUserlandProxy": config.BridgeConfig.EnableUserlandProxy, |
| 915 | 916 |
"UserlandProxyPath": config.BridgeConfig.UserlandProxyPath} |
| 916 | 917 |
bridgeOption := options.Generic{netlabel.GenericData: bridgeConfig}
|