🍉 Sync 2026-11-14 03:49:26

dockerd/Config.in

@@ -15,7 +15,6 @@ config DOCKER_CGROUP_OPTIONS
 	select KERNEL_CGROUP_FREEZER
 	select KERNEL_NET_CLS_CGROUP
 	select KERNEL_CGROUP_NET_PRIO
-	select PACKAGE_cgroupfs-mount
 	help
 		Selects kernel options to enable CGroups V1.
 

dockerd/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dockerd
 PKG_VERSION:=29.6.1
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:mobyproject:moby

dockerd/files/dockerd.init

@@ -166,7 +166,7 @@ process_config() {
 	config_get https_proxy proxies https_proxy "${https_proxy}"
 	config_get no_proxy proxies no_proxy "${no_proxy}"
 	config_get storage_driver globals storage_driver ""
-	config_get max_concurrent_downloads globals max_concurrent_downloads ""
+	config_get max_concurrent_downloads globals max_concurrent_downloads "0"
 
 	. /usr/share/libubox/jshn.sh
 	json_init
@@ -198,7 +198,7 @@ process_config() {
 	fi
 	[ -z "${storage_driver}" ] || json_add_string "storage-driver" "${storage_driver}"
 
-	[ "${max_concurrent_downloads:-0}" -eq "0" ] || json_add_int "max-concurrent-downloads" "${max_concurrent_downloads}"
+	[ "${max_concurrent_downloads}" -eq "0" ] || json_add_int "max-concurrent-downloads" "${max_concurrent_downloads}"
 	json_add_string "log-driver" "json-file"
 	json_add_object "log-opts"
 	json_add_string "max-size" "50m"

dockerd/files/etc/uci-defaults/16_docker-netifd-migrate

@@ -11,3 +11,5 @@ if [ -n "$DOCKER0_DEVICE" ]; then
 fi
 uci -q delete network.docker
 uci commit
+
+exit 0

dockerd/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