Merge pull request #2846 from bboehmke/dockerd_ip6tables

added ip6tables to daemon CLI and config file documentation
This commit is contained in:
Sebastiaan van Stijn 2020-12-03 20:56:21 +01:00 committed by GitHub
commit 98625314fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions

View File

@ -70,6 +70,7 @@ Options:
--ip-forward Enable net.ipv4.ip_forward (default true) --ip-forward Enable net.ipv4.ip_forward (default true)
--ip-masq Enable IP masquerading (default true) --ip-masq Enable IP masquerading (default true)
--iptables Enable addition of iptables rules (default true) --iptables Enable addition of iptables rules (default true)
--ip6tables Enable addition of ip6tables rules (default false)
--ipv6 Enable IPv6 networking --ipv6 Enable IPv6 networking
--label list Set key=value labels to the daemon --label list Set key=value labels to the daemon
--live-restore Enable live restore of docker when containers are still running --live-restore Enable live restore of docker when containers are still running
@ -1392,6 +1393,7 @@ This is a full example of the allowed configuration options on Linux:
"ip-forward": false, "ip-forward": false,
"ip-masq": false, "ip-masq": false,
"iptables": false, "iptables": false,
"ip6tables": false,
"ipv6": false, "ipv6": false,
"labels": [], "labels": [],
"live-restore": true, "live-restore": true,