openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 23:34:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

dockerd: fix breaks IPv6 routing

Browse Source 
Add option to support ip6tables configuration(default false).

Signed-off-by: Milinda Brantini <C_A_T_T_E_R_Y@outlook.com>
This commit is contained in:
Milinda Brantini
2024-07-14 20:03:06 +08:00
committed by Rosen Penev
parent e8688e5c3f
commit 55e689176e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/dockerd/Makefile
View File

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

4
utils/dockerd/files/dockerd.init
View File

@@ -150,7 +150,7 @@ ucidel() {
} }
process_config() { 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 ] || { [ -f /etc/config/dockerd ] || {
# Use the daemon default configuration # Use the daemon default configuration
@@ -172,6 +172,7 @@ process_config() {
config_get data_root globals data_root "/opt/docker/" config_get data_root globals data_root "/opt/docker/"
config_get log_level globals log_level "warn" config_get log_level globals log_level "warn"
config_get_bool iptables globals iptables "1" config_get_bool iptables globals iptables "1"
config_get_bool ip6tables globals ip6tables "0"
# Don't add these options by default # Don't add these options by default
# omission == docker defaults # omission == docker defaults
@@ -190,6 +191,7 @@ process_config() {
json_add_string "data-root" "${data_root}" json_add_string "data-root" "${data_root}"
json_add_string "log-level" "${log_level}" json_add_string "log-level" "${log_level}"
json_add_boolean "iptables" "${iptables}" json_add_boolean "iptables" "${iptables}"
json_add_boolean "ip6tables" "${ip6tables}"
[ -z "${log_driver}" ] || json_add_string "log-driver" "${log_driver}" [ -z "${log_driver}" ] || json_add_string "log-driver" "${log_driver}"
[ -z "${bip}" ] || json_add_string "bip" "${bip}" [ -z "${bip}" ] || json_add_string "bip" "${bip}"
[ -z "${registry_mirrors}" ] || json_add_array "registry-mirrors" [ -z "${registry_mirrors}" ] || json_add_array "registry-mirrors"