From 94444e832ff3bdbde4259a6a494d750261740db3 Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Thu, 3 Jul 2025 14:41:54 +0800
Subject: [PATCH] dockerd: sync upstream

Signed-off-by: sbwml <admin@cooluc.com>
---
 Makefile                 | 5 ++---
 files/etc/config/dockerd | 2 +-
 git-short-commit.sh      | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 91647d9..17d5c0b 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ PKG_BUILD_FLAGS:=no-mips16
 GO_PKG:=github.com/docker/docker
 
 include $(INCLUDE_DIR)/package.mk
-include ../../lang/golang/golang-package.mk
+include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
 
 define Package/dockerd/config
   source "$(SOURCE)/Config.in"
@@ -60,7 +60,6 @@ define Package/dockerd/description
 The Docker CE Engine.
 endef
 
-GO_PKG_BUILD_VARS += GO111MODULE=auto
 TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
 TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
 TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lc -lgcc_eh)
@@ -72,7 +71,7 @@ define EnsureVendoredVersion
 		DEP_VER=$$$$( grep --only-matching --perl-regexp '(?<=PKG_VERSION:=)(.*)' "$(1)" ); \
 		VEN_VER=$$$$( grep --only-matching --perl-regexp '(?<=_VERSION:=v)(.*)(?=})' "$(PKG_BUILD_DIR)/hack/dockerfile/install/$(2)" ); \
 		if [ "$$$${VEN_VER}" != "$$$${DEP_VER}" ]; then \
-			echo "ERROR: Expected 'PKG_VERSION:=$$$${VEN_VER}' in '$(1)', found 'PKG_VERSION:=$$$${DEP_VER}'"; \
+			echo "ERROR: $(PKG_NAME) Expected 'PKG_VERSION:=$$$${VEN_VER}' in '$(1)', found 'PKG_VERSION:=$$$${DEP_VER}'"; \
 			exit 1; \
 		fi \
 	)
diff --git a/files/etc/config/dockerd b/files/etc/config/dockerd
index 0fa4a56..e3fde7c 100644
--- a/files/etc/config/dockerd
+++ b/files/etc/config/dockerd
@@ -26,7 +26,7 @@ config globals 'globals'
 config proxies 'proxies'
 #	option http_proxy 'http://proxy.example.com:3128'
 #	option https_proxy 'https://proxy.example.com:3129'
-#	option http_proxy '*.test.example.com,.example.org,127.0.0.0/8'
+#	option no_proxy '*.test.example.com,.example.org,127.0.0.0/8'
 
 # Docker doesn't work well out of the box with fw4. This is because Docker relies on a compatibility layer that
 # naively translates iptables rules. For the best compatibility replace the following dependencies:
diff --git a/git-short-commit.sh b/git-short-commit.sh
index 650ab8c..6354b9e 100755
--- a/git-short-commit.sh
+++ b/git-short-commit.sh
@@ -39,7 +39,7 @@ git init --quiet "${GIT_DIR}"
 
 		if git fetch --depth 1 origin "${GIT_REF}"; then
 			git checkout --detach FETCH_HEAD --
-			git rev-parse --short HEAD
+			git rev-parse --short=7 HEAD
 			break
 		fi