From 244efe5c689b12444e113fabd97369a5b89ce71a Mon Sep 17 00:00:00 2001 From: casjay Date: Sat, 29 Nov 2025 13:21:12 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Update=20codebase=20?= =?UTF-8?q?=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rootfs/usr/local/etc/docker/init.d/05-dockerd.sh --- rootfs/usr/local/etc/docker/init.d/05-dockerd.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rootfs/usr/local/etc/docker/init.d/05-dockerd.sh b/rootfs/usr/local/etc/docker/init.d/05-dockerd.sh index a152692..f1f2247 100755 --- a/rootfs/usr/local/etc/docker/init.d/05-dockerd.sh +++ b/rootfs/usr/local/etc/docker/init.d/05-dockerd.sh @@ -232,7 +232,7 @@ __run_pre_execute_checks() { echo "Enabling cgroup v2 delegation for Docker-in-Docker" # Enable all available controllers at root if [ -w "/sys/fs/cgroup/cgroup.subtree_control" ]; then - cat /sys/fs/cgroup/cgroup.controllers > /sys/fs/cgroup/cgroup.subtree_control 2>/dev/null || true + cat /sys/fs/cgroup/cgroup.controllers >/sys/fs/cgroup/cgroup.subtree_control 2>/dev/null || true fi fi [ -L "/config/docker/daemon.json" ] && unlink "/config/docker/daemon.json" @@ -290,7 +290,9 @@ EOF EOF fi fi - [ -f "/config/docker/daemon.json" ] && cp -Rf "/config/docker/daemon.json" "/etc/docker/daemon.json" + if [ -f "/config/docker/daemon.json" ] && [ ! -L "/etc/docker/daemon.json" ]; then + cp -Rf "/config/docker/daemon.json" "/etc/docker/daemon.json" + fi [ -f "$ETC_DIR/daemon.json" ] && sed -i 's|"REPLACE_DOCKER_REGISTRIES"|'$registry'|g' "$ETC_DIR/daemon.json" [ -f "$CONF_DIR/daemon.json" ] && sed -i 's|"REPLACE_DOCKER_REGISTRIES"|'$registry'|g' "$CONF_DIR/daemon.json" }