From 92cafdcba89e0d9cbb2ad9bfc10df42cf57b1576 Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Fri, 18 Apr 2025 00:28:18 +0800
Subject: [PATCH] update 2025-04-18 00:28:18

---
 dockerd/Makefile                                   |  4 ++--
 luci-app-passwall/luasrc/controller/passwall.lua   |  4 ++--
 .../luasrc/view/passwall/rule_list/geoview.htm     | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dockerd/Makefile b/dockerd/Makefile
index 222f3b6c6..1fc457b62 100644
--- a/dockerd/Makefile
+++ b/dockerd/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dockerd
-PKG_VERSION:=28.0.4
+PKG_VERSION:=28.1.0
 PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -10,7 +10,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_GIT_URL:=github.com/moby/moby
 PKG_GIT_REF:=v$(PKG_VERSION)
 PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)?
-PKG_HASH:=4b347a2b83221952cab93197f6e9bc7ffe54dd4bd0a9644c176aecde551721ca
+PKG_HASH:=da7dc30bf04d006fd25e0b8f8dedd773a456760f5d57afeef6e1520290bc9592
 PKG_GIT_SHORT_COMMIT:=c710b88 # SHA1 used within the docker executables
 
 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
diff --git a/luci-app-passwall/luasrc/controller/passwall.lua b/luci-app-passwall/luasrc/controller/passwall.lua
index 23ad0bbae..5a9025c18 100644
--- a/luci-app-passwall/luasrc/controller/passwall.lua
+++ b/luci-app-passwall/luasrc/controller/passwall.lua
@@ -584,7 +584,7 @@ function geo_view()
 		else
 			geo_type, file_path = "geosite", geosite_path
 		end
-		cmd = string.format("geoview -type %s -action lookup -input '%s' -value '%s'", geo_type, file_path, value)
+		cmd = string.format("geoview -type %s -action lookup -input '%s' -value '%s' -lowmem=true", geo_type, file_path, value)
 		geo_string = luci.sys.exec(cmd):lower()
 		if geo_string ~= "" then
 			local lines = {}
@@ -603,7 +603,7 @@ function geo_view()
 		if prefix and list and list ~= "" then
 			geo_type = prefix:sub(1, -2)
 			file_path = (geo_type == "geoip") and geoip_path or geosite_path
-			cmd = string.format("geoview -type %s -action extract -input '%s' -list '%s'", geo_type, file_path, list)
+			cmd = string.format("geoview -type %s -action extract -input '%s' -list '%s' -lowmem=true", geo_type, file_path, list)
 			geo_string = luci.sys.exec(cmd)
 		end
 	end
diff --git a/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm b/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm
index 7b95b42c1..bbb2c12d7 100644
--- a/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm
+++ b/luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm
@@ -78,5 +78,19 @@ local api = require "luci.passwall.api"
 				btn.value = QueryText;
 			})
 	}
+
+	document.getElementById("geoview.lookup").addEventListener("keydown", function(event) {
+		if (event.key === "Enter") {
+			event.preventDefault();
+			lookup_btn.click();
+		}
+	});
+
+	document.getElementById("geoview.extract").addEventListener("keydown", function(event) {
+		if (event.key === "Enter") {
+			event.preventDefault();
+			extract_btn.click();
+		}
+	});
 	//]]>
 </script>