dockerd: Added options to setup a dualstack default bridge

* Added IPv6 Support

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>

diff --git a/utils/dockerd/files/dockerd.init b/utils/dockerd/files/dockerd.init
index 2eb272a70c5e563ef44bdc62976d819f3e0304ac..d3709f33569eaf3f55e5f81ec61c8fb65ea0197c 100755 (executable)
--- a/utils/dockerd/files/dockerd.init
+++ b/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

diff --git a/utils/dockerd/files/etc/config/dockerd b/utils/dockerd/files/etc/config/dockerd
index 72dc98624a69c7559879ea3ac28c7c86b6388c1c..872ff131e4ce041034e3e3b317fdea5da48edd7b 100644 (file)
--- a/utils/dockerd/files/etc/config/dockerd
+++ b/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'