diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-02-28 01:29:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 01:29:50 -0800 |
| commit | 36366c1bbc043164586e1ff5a1391795dfdc64d3 (patch) | |
| tree | a822571af76b54ec085e964bedad6b17cc7f9f4b | |
| parent | 56b03ecb5fab0afe55042de85c864c9f646735f9 (diff) | |
| parent | a54e8acfb520d58590ca30dfe943a338098895f9 (diff) | |
Merge pull request #14938 from G-M0N3Y-2503/dockerd-ipv6-config-bridge
dockerd: ipv6 bridge config
| -rw-r--r-- | utils/dockerd/Makefile | 2 | ||||
| -rwxr-xr-x | utils/dockerd/files/dockerd.init | 8 | ||||
| -rw-r--r-- | utils/dockerd/files/etc/config/dockerd | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index 1075d8e28..12f3bb9e2 100644 --- a/utils/dockerd/Makefile +++ b/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 diff --git a/utils/dockerd/files/dockerd.init b/utils/dockerd/files/dockerd.init index 2eb272a70..d3709f335 100755 --- 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 72dc98624..872ff131e 100644 --- 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' |