From 55e689176ec52afde0cda0ee2b48dbff349d6c6c Mon Sep 17 00:00:00 2001 From: Milinda Brantini Date: Sun, 14 Jul 2024 20:03:06 +0800 Subject: [PATCH] dockerd: fix breaks IPv6 routing Add option to support ip6tables configuration(default false). Signed-off-by: Milinda Brantini --- utils/dockerd/Makefile | 2 +- utils/dockerd/files/dockerd.init | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index 4488e91120..687f046b2f 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -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 diff --git a/utils/dockerd/files/dockerd.init b/utils/dockerd/files/dockerd.init index 111e2cd8db..6086b51952 100755 --- a/utils/dockerd/files/dockerd.init +++ b/utils/dockerd/files/dockerd.init @@ -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" -- 2.30.2