diff --git a/Dockerfile b/Dockerfile index 5f11901..da6f85c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ## Buildstage ## -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:3.21 as buildstage ARG MOD_VERSION diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run index 8afcdac..e0dbc80 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-add-package/run @@ -1,11 +1,5 @@ #!/usr/bin/with-contenv bash -ARCH=$(uname -m) -if [[ "${ARCH}" = "armv7l" ]]; then - echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****" - exit 0 -fi - ABC_USER=$(id -nu ${PUID:-911}) mkdir -p /config/{logs/dockerd,var/lib/docker} lsiown -R ${ABC_USER}:${ABC_USER} /config/logs diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run index 41ef32b..c2edfb5 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-universal-docker-in-docker-qemu/run @@ -1,10 +1,5 @@ #!/usr/bin/with-contenv bash -if [[ $(uname -m) = "armv7l" ]]; then - echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****" - exit 0 -fi - echo "**** Enabling QEMU ****" docker pull lscr.io/linuxserver/qemu-static exec docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset -p yes diff --git a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run index 7a43d80..0db0b6e 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-mod-universal-docker-in-docker/run @@ -1,10 +1,5 @@ #!/usr/bin/with-contenv bash -if [[ $(uname -m) = "armv7l" ]]; then - echo "**** The universal docker mod no longer supports arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****" - sleep infinity -fi - ## dind hack from https://github.com/moby/moby/blob/master/hack/dind export container=docker if [ -d /sys/kernel/security ] && ! mountpoint -q /sys/kernel/security; then