zhao/packages_utils_dockerd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dockerd: sync upstream

Browse Source 
Signed-off-by: sbwml <admin@cooluc.com>
This commit is contained in:
sbwml 2025-07-03 14:41:54 +08:00
parent 8fbdc69d19
commit 94444e832f
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -22,7 +22,7 @@ PKG_BUILD_FLAGS:=no-mips16
GO_PKG:=github.com/docker/docker GO_PKG:=github.com/docker/docker
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../../lang/golang/golang-package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
define Package/dockerd/config define Package/dockerd/config
source "$(SOURCE)/Config.in" source "$(SOURCE)/Config.in"
@ -60,7 +60,6 @@ define Package/dockerd/description
The Docker CE Engine. The Docker CE Engine.
endef endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS) TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lc -lgcc_eh) 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)" ); \ 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)" ); \ VEN_VER=$$$$( grep --only-matching --perl-regexp '(?<=_VERSION:=v)(.*)(?=})' "$(PKG_BUILD_DIR)/hack/dockerfile/install/$(2)" ); \
if [ "$$$${VEN_VER}" != "$$$${DEP_VER}" ]; then \ 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; \ exit 1; \
fi \ fi \
) )

2
files/etc/config/dockerd
View File

@ -26,7 +26,7 @@ config globals 'globals'
config proxies 'proxies' config proxies 'proxies'
# option http_proxy 'http://proxy.example.com:3128' # option http_proxy 'http://proxy.example.com:3128'
# option https_proxy 'https://proxy.example.com:3129' # 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 # 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: # naively translates iptables rules. For the best compatibility replace the following dependencies:

2
git-short-commit.sh
View File

@ -39,7 +39,7 @@ git init --quiet "${GIT_DIR}"
if git fetch --depth 1 origin "${GIT_REF}"; then if git fetch --depth 1 origin "${GIT_REF}"; then
git checkout --detach FETCH_HEAD -- git checkout --detach FETCH_HEAD --
git rev-parse --short HEAD git rev-parse --short=7 HEAD
break break
fi fi