Merge pull request #14938 from G-M0N3Y-2503/dockerd-ipv6-config-bridge

dockerd: ipv6 bridge config

utils/dockerd/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dockerd
 PKG_VERSION:=20.10.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 

utils/dockerd/files/dockerd.init

@@ -143,6 +143,10 @@ process_config() {
 	config_get registry_mirrors globals registry_mirrors ""
 	config_get hosts globals hosts ""
 	config_get dns globals dns ""
+	config_get_bool ipv6 globals ipv6 ""
+	config_get ip globals ip ""
+	config_get fixed_cidr globals fixed_cidr ""
+	config_get fixed_cidr_v6 globals fixed_cidr_v6 ""
 
 	. /usr/share/libubox/jshn.sh
 	json_init
@@ -159,6 +163,10 @@ process_config() {
 	[ -z "${dns}" ] || json_add_array "dns"
 	[ -z "${dns}" ] || config_list_foreach globals dns json_add_array_string
 	[ -z "${dns}" ] || json_close_array
+	[ -z "${ipv6}" ] || json_add_boolean "ipv6" "${ipv6}"
+	[ -z "${ip}" ] || json_add_string "ip" "${ip}"
+	[ -z "${fixed_cidr}" ] || json_add_string "fixed-cidr" "${fixed_cidr}"
+	[ -z "${fixed_cidr_v6}" ] || json_add_string "fixed-cidr-v6" "${fixed_cidr_v6}"
 	json_dump > "${DOCKERD_CONF}"
 
 	[ "${iptables}" -eq "1" ] && config_foreach iptables_add_blocking_rule firewall

utils/dockerd/files/etc/config/dockerd

@@ -11,6 +11,10 @@ config globals 'globals'
 	option iptables '1'
 #	list hosts 'unix:///var/run/docker.sock'
 #	option bip '172.18.0.1/24'
+#	option fixed_cidr '172.17.0.0/16'
+#	option fixed_cidr_v6 'fc00:1::/80'
+#	option ipv6 '1'
+#	option ip '::ffff:0.0.0.0'
 #	list dns '172.17.0.1'
 #	list registry_mirrors 'https://<my-docker-mirror-host>'
 #	list registry_mirrors 'https://hub.docker.com'