Skip to content

Commit a1ea794

Browse files
authored
Merge pull request #6230 from robmry/moby29_dockerd_reference
dockerd.md: --firewall-backend and --bridge-accept-fwmark
2 parents 66aca29 + 3f0ccd1 commit a1ea794

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

docs/reference/dockerd.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Options:
2929
--bip string IPv4 address for the default bridge
3030
--bip6 string IPv6 address for the default bridge
3131
-b, --bridge string Attach containers to a network bridge
32+
--bridge-accept-fwmark string In bridge networks, accept packets with this firewall mark/mask
3233
--cdi-spec-dir list CDI specification directories to use
3334
--cgroup-parent string Set parent cgroup for all containers
3435
--config-file string Daemon configuration file (default "/etc/docker/daemon.json")
@@ -58,6 +59,7 @@ Options:
5859
--exec-root string Root directory for execution state files (default "/var/run/docker")
5960
--experimental Enable experimental features
6061
--feature map Enable feature in the daemon
62+
--firewall-backend string Firewall backend to use, iptables or nftables
6163
--fixed-cidr string IPv4 subnet for the default bridge network
6264
--fixed-cidr-v6 string IPv6 subnet for the default bridge network
6365
-G, --group string Group for the unix socket (default "docker")
@@ -1070,6 +1072,7 @@ The following is a full example of the allowed configuration options on Linux:
10701072
"bip": "",
10711073
"bip6": "",
10721074
"bridge": "",
1075+
"bridge-accept-fwmark": "",
10731076
"builder": {
10741077
"gc": {
10751078
"enabled": true,
@@ -1120,6 +1123,7 @@ The following is a full example of the allowed configuration options on Linux:
11201123
"cdi": true,
11211124
"containerd-snapshotter": true
11221125
},
1126+
"firewall-backend": "",
11231127
"fixed-cidr": "",
11241128
"fixed-cidr-v6": "",
11251129
"group": "",

0 commit comments

Comments
 (0)