From b208b0042043f67e0c886cfa78cb0070fc864ce8 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 15 Mar 2026 20:36:38 +0000 Subject: [PATCH 1/4] Tidy up obsolete settings, fix typo, add extra packages --- Dockerfile | 2 ++ Dockerfile.aarch64 | 2 ++ Dockerfile.riscv64 | 2 ++ .../s6-rc.d/init-build-agent-config/run | 18 ------------------ root/etc/s6-overlay/s6-rc.d/init-qemu/run | 2 +- 5 files changed, 7 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 013e706..f1bd9c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,12 +12,14 @@ LABEL maintainer="thespad" RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ + alpine-release \ btrfs-progs \ docker \ docker-cli-buildx \ docker-cli-compose \ e2fsprogs \ e2fsprogs-extra \ + erofs-utils \ git \ ip6tables \ iptables \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9313bb3..f3b9460 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,12 +12,14 @@ LABEL maintainer="thespad" RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ + alpine-release \ btrfs-progs \ docker \ docker-cli-buildx \ docker-cli-compose \ e2fsprogs \ e2fsprogs-extra \ + erofs-utils \ git \ ip6tables \ iptables \ diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 index 21d475d..6861e5a 100644 --- a/Dockerfile.riscv64 +++ b/Dockerfile.riscv64 @@ -12,12 +12,14 @@ LABEL maintainer="thespad" RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ + alpine-release \ btrfs-progs \ docker \ docker-cli-buildx \ docker-cli-compose \ e2fsprogs \ e2fsprogs-extra \ + erofs-utils \ git \ ip6tables \ iptables \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-build-agent-config/run b/root/etc/s6-overlay/s6-rc.d/init-build-agent-config/run index d484f0f..167dc1f 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-build-agent-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-build-agent-config/run @@ -107,24 +107,6 @@ fi HOME=/config git config --global user.email "ci@linuxserver.io" HOME=/config git config --global user.name "LinuxServer-CI" -# Remove old Docker image store -if [[ -d "/config/var/lib/docker/overlay2/" ]]; then - rm -rf "/config/var/lib/docker/overlay2/" -fi - -if [[ -d "/config/var/lib/docker/image/" ]]; then - rm -rf "/config/var/lib/docker/image/" -fi - -# Enable containerd image store -cat </etc/docker/daemon.json -{ - "features": { - "containerd-snapshotter": true - } -} -EOF - # permissions lsiown -R "${USER_NAME}":"${USER_NAME}" \ /config diff --git a/root/etc/s6-overlay/s6-rc.d/init-qemu/run b/root/etc/s6-overlay/s6-rc.d/init-qemu/run index fab3f50..a0f2c00 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-qemu/run +++ b/root/etc/s6-overlay/s6-rc.d/init-qemu/run @@ -1,7 +1,7 @@ #!/usr/bin/with-contenv bash echo "┌─────────────────────────────────────────────────────────────────────────────────┐" -echo "│ Make sure you enable you enable QEMU. Run: │" +echo "│ Make sure you enable QEMU. Run: │" echo "│ │" echo "│ docker run --rm -it --privileged ghcr.io/linuxserver/qemu-static --reset -p yes │" echo "│ │" From 9813cb4d3fad00ca71edcb1baef2f4b275f1acf2 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 15 Mar 2026 20:43:41 +0000 Subject: [PATCH 2/4] Remove experimental arg --- root/etc/s6-overlay/s6-rc.d/svc-docker-in-docker/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/svc-docker-in-docker/run b/root/etc/s6-overlay/s6-rc.d/svc-docker-in-docker/run index 2e7ae99..96f7f26 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-docker-in-docker/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-docker-in-docker/run @@ -32,4 +32,4 @@ mount --make-rshared / exec 2>&1 \ s6-notifyoncheck -d -n 300 -w 1000 -c "docker version" \ - /usr/bin/dockerd --data-root "/config/var/lib/docker" --experimental + /usr/bin/dockerd --data-root "/config/var/lib/docker" From 8f67be37377caee1844402635c9679c4d56823a8 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 15 Mar 2026 21:35:30 +0000 Subject: [PATCH 3/4] Set home to /config at build time --- Dockerfile | 2 ++ Dockerfile.aarch64 | 2 ++ Dockerfile.riscv64 | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index f1bd9c4..85934e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,8 @@ ARG BUILD_AGENT_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thespad" +ENV HOME=/config + RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f3b9460..a11427f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -9,6 +9,8 @@ ARG BUILD_AGENT_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thespad" +ENV HOME=/config + RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 index 6861e5a..7890a13 100644 --- a/Dockerfile.riscv64 +++ b/Dockerfile.riscv64 @@ -9,6 +9,8 @@ ARG BUILD_AGENT_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thespad" +ENV HOME=/config + RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ From 47e65ee0f59ef73fb4e5d5aab73f9164836b4b06 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 15 Mar 2026 21:43:21 +0000 Subject: [PATCH 4/4] Remove HOMEs that aren't required any more --- root/etc/s6-overlay/s6-rc.d/init-build-agent-config/run | 4 ++-- root/etc/s6-overlay/s6-rc.d/init-buildx-config/run | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-build-agent-config/run b/root/etc/s6-overlay/s6-rc.d/init-build-agent-config/run index 167dc1f..bdcd0d5 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-build-agent-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-build-agent-config/run @@ -104,8 +104,8 @@ if ! id -nG "$(id -nu "${PUID:-911}")" | grep -q "docker"; then usermod -aG docker "$(id -nu "${PUID:-911}")" fi -HOME=/config git config --global user.email "ci@linuxserver.io" -HOME=/config git config --global user.name "LinuxServer-CI" +git config --global user.email "ci@linuxserver.io" +git config --global user.name "LinuxServer-CI" # permissions lsiown -R "${USER_NAME}":"${USER_NAME}" \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-buildx-config/run b/root/etc/s6-overlay/s6-rc.d/init-buildx-config/run index 0df0405..c9d178f 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-buildx-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-buildx-config/run @@ -2,8 +2,8 @@ # shellcheck shell=bash docker pull docker.io/moby/buildkit:buildx-stable-1 -HOME=/config docker buildx rm container >/dev/null 2>&1 -HOME=/config docker buildx create --driver docker-container --name container --bootstrap >/dev/null 2>&1 +docker buildx rm container >/dev/null 2>&1 +docker buildx create --driver docker-container --name container --bootstrap >/dev/null 2>&1 docker image prune -f >/dev/null 2>&1 USER_NAME=${USER_NAME:-jenkins}