Skip to content
Snippets Groups Projects
Commit d14e460b authored by Milinda Brantini's avatar Milinda Brantini Committed by Tianling Shen
Browse files

dockerd: fix breaks IPv6 routing


Add option to support ip6tables configuration(default false).

Signed-off-by: default avatarMilinda Brantini <C_A_T_T_E_R_Y@outlook.com>
(cherry picked from commit 55e689176ec52afde0cda0ee2b48dbff349d6c6c)
parent 8403d146
No related branches found
No related tags found
1 merge request!91Merge OpenWrt 23.05.4 commit '89955ee711d' into devel
......@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dockerd
PKG_VERSION:=27.0.3
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
......
......@@ -150,7 +150,7 @@ ucidel() {
}
process_config() {
local alt_config_file data_root log_level iptables bip
local alt_config_file data_root log_level iptables ip6tables bip
[ -f /etc/config/dockerd ] || {
# Use the daemon default configuration
......@@ -172,6 +172,7 @@ process_config() {
config_get data_root globals data_root "/opt/docker/"
config_get log_level globals log_level "warn"
config_get_bool iptables globals iptables "1"
config_get_bool ip6tables globals ip6tables "0"
# Don't add these options by default
# omission == docker defaults
......@@ -190,6 +191,7 @@ process_config() {
json_add_string "data-root" "${data_root}"
json_add_string "log-level" "${log_level}"
json_add_boolean "iptables" "${iptables}"
json_add_boolean "ip6tables" "${ip6tables}"
[ -z "${log_driver}" ] || json_add_string "log-driver" "${log_driver}"
[ -z "${bip}" ] || json_add_string "bip" "${bip}"
[ -z "${registry_mirrors}" ] || json_add_array "registry-mirrors"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment