From 2b76b3a43429052de7f2dd2081a45e75193233ea Mon Sep 17 00:00:00 2001 From: pi-farm Date: Tue, 17 Mar 2026 23:27:36 +0100 Subject: [PATCH 1/5] first try --- .gitignore | 1 + Dockerfile | 89 ++++++++++++++++++++++++++++++++++++---------- Dockerfile.aarch64 | 89 ++++++++++++++++++++++++++++++++++++---------- buildargs.env | 41 +++++++++++---------- 4 files changed, 163 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 430d480..863c1d9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ **/node_modules **/dist **/*.log +.vscode/* # Betriebssystem-Dateien .DS_Store diff --git a/Dockerfile b/Dockerfile index 07bb5b9..bea3556 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,80 @@ -# Example Dockerfile for amd64 -ARG BASE_IMAGE=alpine:latest +# syntax=docker/dockerfile:1 +ARG BUILD_BASE_IMAGE +FROM ${BUILD_BASE_IMAGE} -FROM ${BASE_IMAGE} +ARG BUILD_APP_VERSION +ARG BUILD_S6_ARCH_amd64 +ARG BUILD_S6_OVERLAY_VERSION +ARG BUILD_DATE +ARG MODS_VERSION="v3" +ARG PKG_INST_VERSION="v1" +ARG LSIOWN_VERSION="v1" +ARG WITHCONTENV_VERSION="v1" +ARG BUILD_APP_USER +ARG BUILD_APP_UID +ARG BUILD_APP_GID +ARG BUILD_MAINTAINER -ARG MAINTAINER -ARG TZ -ARG APP_NAME -ARG APP_USER +LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="${BUILD_MAINTAINER}" -LABEL maintainer="${MAINTAINER}" -LABEL org.opencontainers.image.title="${APP_NAME}" +# RHEL nutzt microdnf. Wir installieren xz (für tar) und shadow-utils (für useradd) +RUN microdnf update -y && \ + microdnf install -y --nodocs \ + xz \ + tar \ + shadow-utils \ + tzdata && \ + microdnf clean all -ENV TZ=${TZ} -ENV USER=${APP_USER} +# add s6 overlay +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-${BUILD_S6_ARCH_amd64}.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-${BUILD_S6_ARCH_amd64}.tar.xz -RUN apk add --no-cache tzdata ca-certificates +# add s6 optional symlinks +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz && unlink /usr/bin/with-contenv +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz -WORKDIR /app -COPY ./config /app/config -COPY ./data /app/data +# LSIO Mods Integration +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" +ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/with-contenv.${WITHCONTENV_VERSION}" "/usr/bin/with-contenv" -RUN adduser -D ${APP_USER} && chown -R ${APP_USER}:${APP_USER} /app +# set environment variables +ENV HOME="/root" \ + LANGUAGE="de_DE.UTF-8" \ + LANG="de_DE.UTF-8" \ + TERM="xterm" \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ + S6_VERBOSITY=1 \ + S6_STAGE2_HOOK=/docker-mods \ + VIRTUAL_ENV=/lsiopy \ + PATH="/lsiopy/bin:$PATH" -USER ${APP_USER} +RUN echo "**** install packages and locales ****" && \ + microdnf install -y --nodocs \ + glibc-langpack-de \ + curl \ + jq \ + nmap-ncat \ + cronie && \ + echo "**** create user and folders ****" && \ + # In RHEL prüfen wir, ob die Gruppe existiert, bevor wir sie anlegen + groupadd -g ${BUILD_APP_GID} ${BUILD_APP_USER} || true && \ + useradd -u ${BUILD_APP_UID} -g ${BUILD_APP_GID} -d /config -s /bin/false ${BUILD_APP_USER} && \ + mkdir -p /app /config /defaults /lsiopy && \ + echo "**** cleanup ****" && \ + microdnf clean all && \ + rm -rf /tmp/* /var/tmp/* -CMD ["sh"] \ No newline at end of file +# 7. Lokale Skripte kopieren und Ausführungsrechte für S6 reparieren +ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/stable.tar.gz /tmp +RUN tar -C / -Jxpf /tmp/stable.tar.gz && rm -rf /tmp/stable.tar.gz +RUN find /etc/s6-overlay/s6-rc.d/ -type f \( -name "run" -o -name "up" \) -exec chmod +x {} + + +ENTRYPOINT ["/init"] \ No newline at end of file diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f02657b..5f6456f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,27 +1,80 @@ -# Example Dockerfile for arm64 -ARG BASE_IMAGE=alpine:latest +# syntax=docker/dockerfile:1 +ARG BUILD_BASE_IMAGE +FROM ${BUILD_BASE_IMAGE} -FROM ${BASE_IMAGE} +ARG BUILD_APP_VERSION +ARG BUILD_S6_ARCH_aarch64 +ARG BUILD_S6_OVERLAY_VERSION +ARG BUILD_DATE +ARG MODS_VERSION="v3" +ARG LSIOWN_VERSION="v1" +ARG WITHCONTENV_VERSION="v1" +ARG BUILD_APP_USER +ARG BUILD_APP_UID +ARG BUILD_APP_GID +ARG BUILD_MAINTAINER -ARG MAINTAINER -ARG TZ -ARG APP_NAME -ARG APP_USER +LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="${BUILD_MAINTAINER}" -LABEL maintainer="${MAINTAINER}" -LABEL org.opencontainers.image.title="${APP_NAME}" +# 1. EPEL Repository und Grundpakete für RHEL/UBI installieren +RUN microdnf install -y --nodocs \ + https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ + microdnf update -y && \ + microdnf install -y --nodocs \ + xz \ + tar \ + shadow-utils \ + tzdata && \ + microdnf clean all -ENV TZ=${TZ} -ENV USER=${APP_USER} +# 2. S6 Overlay hinzufügen (explizit für aarch64) +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-${BUILD_S6_ARCH_aarch64}.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-${BUILD_S6_ARCH_aarch64}.tar.xz -RUN apk add --no-cache tzdata ca-certificates +# 3. S6 optionale Symlinks +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz && unlink /usr/bin/with-contenv +ADD https://github.com/just-containers/s6-overlay/releases/download/v${BUILD_S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp +RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz -WORKDIR /app -COPY ./config /app/config -COPY ./data /app/data +# 4. LSIO Mods Integration (ohne package-install, da es via COPY root/ kommt) +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" +ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/with-contenv.${WITHCONTENV_VERSION}" "/usr/bin/with-contenv" -RUN adduser -D ${APP_USER} && chown -R ${APP_USER}:${APP_USER} /app +# 5. Umgebungsvariablen setzen +ENV HOME="/root" \ + LANGUAGE="de_DE.UTF-8" \ + LANG="de_DE.UTF-8" \ + TERM="xterm" \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ + S6_VERBOSITY=1 \ + S6_STAGE2_HOOK=/docker-mods \ + VIRTUAL_ENV=/lsiopy \ + PATH="/lsiopy/bin:$PATH" -USER ${APP_USER} +# 6. Restliche Pakete (aus EPEL & UBI), User und Ordner anlegen +RUN echo "**** install packages and locales ****" && \ + microdnf install -y --nodocs \ + glibc-langpack-de \ + curl \ + jq \ + nmap-ncat \ + cronie && \ + echo "**** create abc user and make our folders ****" && \ + groupadd -g ${BUILD_APP_GID} ${BUILD_APP_USER} || true && \ + useradd -u ${BUILD_APP_UID} -g ${BUILD_APP_GID} -d /config -s /bin/false ${BUILD_APP_USER} && \ + mkdir -p /app /config /defaults /lsiopy && \ + echo "**** cleanup ****" && \ + microdnf clean all && \ + rm -rf /tmp/* /var/tmp/* -CMD ["sh"] \ No newline at end of file +# 7. Lokale Skripte kopieren und Ausführungsrechte für S6 reparieren +ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/stable.tar.gz /tmp +RUN tar -C / -Jxpf /tmp/stable.tar.gz && rm -rf /tmp/stable.tar.gz +RUN find /etc/s6-overlay/s6-rc.d/ -type f \( -name "run" -o -name "up" \) -exec chmod +x {} + + +ENTRYPOINT ["/init"] \ No newline at end of file diff --git a/buildargs.env b/buildargs.env index dad5f2a..6104afd 100644 --- a/buildargs.env +++ b/buildargs.env @@ -1,26 +1,25 @@ ## BUILD STAGE -BUILD_TAG=1.00 -BUILD_BASE_IMAGE=alpine:${BUILD_TAG} -## Examples for BUILD_BASE_IMAGE -# alpine:${BUILD_TAG} -# git.pi-farm.de/pi-farm/docker-baseimage-alpine:v${BUILD_TAG} -#BUILD_ALPINE_ARCH_AMD64=x86_64 -#BUILD_ALPINE_ARCH_AARCH64=aarch64 -#BUILD_S6_ARCH_amd64=x86_64 -#BUILD_S6_ARCH_aarch64=aarch64 -#BUILD_S6_OVERLAY_VERSION=3.2.0.2 -#BUILD_MAINTAINER=pi-farm -#BUILD_APP_VERSION=v${BUILD_TAG} -#BUILD_APP_NAME=basimage-alpine -#BUILD_APP_USER=pi -#BUILD_APP_GID=1000 +BUILD_BASE_TAG=9.3 +BUILD_TAG_LATEST=y +# Wir nutzen UBI Minimal für ein kleines Image +BUILD_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest + +BUILD_RHEL_ARCH=x86_64 +BUILD_RHEL_ARCH_AARCH64=aarch64 +BUILD_RHEL_REL=9 +BUILD_S6_ARCH_amd64=x86_64 +BUILD_S6_ARCH_aarch64=aarch64 +BUILD_S6_OVERLAY_VERSION=3.2.2.0 +BUILD_MAINTAINER=pi-farm +BUILD_APP_VERSION=ubi9 +BUILD_APP_NAME=baseimage-rhel +BUILD_APP_USER=pi +BUILD_APP_UID=1000 +BUILD_APP_GID=1000 + ## ENV STAGE ENV_TZ=Europe/Berlin ENV_PUID=1000 ENV_PGID=1000 -# VOL_CONFIG=./config:/config -# VOL_DATA=./data:/data -# PORT_WEB=8080:80 -#PUSH=gitea,dockerhub -DESCRIPTION="Example example example" - +PUSH=gitea +DESCRIPTION="This is a RHEL (UBI) based image with s6-overlay.\nBased on the great work of Linuxserver.io" \ No newline at end of file From 7832b40a0153da900a582430931f452452210ee1 Mon Sep 17 00:00:00 2001 From: pi-farm Date: Tue, 17 Mar 2026 23:40:53 +0100 Subject: [PATCH 2/5] 2. versuch --- Dockerfile | 36 +++++++++++++++++------------------- Dockerfile.aarch64 | 32 ++++++++++++++------------------ 2 files changed, 31 insertions(+), 37 deletions(-) diff --git a/Dockerfile b/Dockerfile index bea3556..5a3c773 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,13 +18,12 @@ ARG BUILD_MAINTAINER LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="${BUILD_MAINTAINER}" -# RHEL nutzt microdnf. Wir installieren xz (für tar) und shadow-utils (für useradd) -RUN microdnf update -y && \ +# 1. EPEL und Basis-Tools (shadow-utils ist kritisch für useradd!) +RUN microdnf install -y --nodocs \ + https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ + microdnf update -y && \ microdnf install -y --nodocs \ - xz \ - tar \ - shadow-utils \ - tzdata && \ + xz tar shadow-utils tzdata && \ microdnf clean all # add s6 overlay @@ -56,21 +55,20 @@ ENV HOME="/root" \ VIRTUAL_ENV=/lsiopy \ PATH="/lsiopy/bin:$PATH" -RUN echo "**** install packages and locales ****" && \ +# 2. Pakete installieren +RUN echo "**** install packages ****" && \ microdnf install -y --nodocs \ - glibc-langpack-de \ - curl \ - jq \ - nmap-ncat \ - cronie && \ - echo "**** create user and folders ****" && \ - # In RHEL prüfen wir, ob die Gruppe existiert, bevor wir sie anlegen - groupadd -g ${BUILD_APP_GID} ${BUILD_APP_USER} || true && \ + glibc-all-langpacks \ + curl jq nmap-ncat cronie && \ + microdnf clean all + +# 3. User und Verzeichnisse (getrennt vom Paket-Install!) +RUN echo "**** create user and folders ****" && \ + if ! getent group ${BUILD_APP_GID} >/dev/null; then \ + groupadd -g ${BUILD_APP_GID} ${BUILD_APP_USER}; \ + fi && \ useradd -u ${BUILD_APP_UID} -g ${BUILD_APP_GID} -d /config -s /bin/false ${BUILD_APP_USER} && \ - mkdir -p /app /config /defaults /lsiopy && \ - echo "**** cleanup ****" && \ - microdnf clean all && \ - rm -rf /tmp/* /var/tmp/* + mkdir -p /app /config /defaults /lsiopy # 7. Lokale Skripte kopieren und Ausführungsrechte für S6 reparieren ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/stable.tar.gz /tmp diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5f6456f..55aec12 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -17,15 +17,12 @@ ARG BUILD_MAINTAINER LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="${BUILD_MAINTAINER}" -# 1. EPEL Repository und Grundpakete für RHEL/UBI installieren +# 1. EPEL und Basis-Tools (shadow-utils ist kritisch für useradd!) RUN microdnf install -y --nodocs \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ microdnf update -y && \ microdnf install -y --nodocs \ - xz \ - tar \ - shadow-utils \ - tzdata && \ + xz tar shadow-utils tzdata && \ microdnf clean all # 2. S6 Overlay hinzufügen (explizit für aarch64) @@ -56,21 +53,20 @@ ENV HOME="/root" \ VIRTUAL_ENV=/lsiopy \ PATH="/lsiopy/bin:$PATH" -# 6. Restliche Pakete (aus EPEL & UBI), User und Ordner anlegen -RUN echo "**** install packages and locales ****" && \ +# 2. Pakete installieren +RUN echo "**** install packages ****" && \ microdnf install -y --nodocs \ - glibc-langpack-de \ - curl \ - jq \ - nmap-ncat \ - cronie && \ - echo "**** create abc user and make our folders ****" && \ - groupadd -g ${BUILD_APP_GID} ${BUILD_APP_USER} || true && \ + glibc-all-langpacks \ + curl jq nmap-ncat cronie && \ + microdnf clean all + +# 3. User und Verzeichnisse (getrennt vom Paket-Install!) +RUN echo "**** create user and folders ****" && \ + if ! getent group ${BUILD_APP_GID} >/dev/null; then \ + groupadd -g ${BUILD_APP_GID} ${BUILD_APP_USER}; \ + fi && \ useradd -u ${BUILD_APP_UID} -g ${BUILD_APP_GID} -d /config -s /bin/false ${BUILD_APP_USER} && \ - mkdir -p /app /config /defaults /lsiopy && \ - echo "**** cleanup ****" && \ - microdnf clean all && \ - rm -rf /tmp/* /var/tmp/* + mkdir -p /app /config /defaults /lsiopy # 7. Lokale Skripte kopieren und Ausführungsrechte für S6 reparieren ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/stable.tar.gz /tmp From 14f8d5d6d82412a1c6840bb3fa487a7075e042b0 Mon Sep 17 00:00:00 2001 From: pi-farm Date: Tue, 17 Mar 2026 23:44:15 +0100 Subject: [PATCH 3/5] 3. --- Dockerfile | 11 +++++++---- Dockerfile.aarch64 | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5a3c773..5410058 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,12 +18,15 @@ ARG BUILD_MAINTAINER LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="${BUILD_MAINTAINER}" -# 1. EPEL und Basis-Tools (shadow-utils ist kritisch für useradd!) -RUN microdnf install -y --nodocs \ - https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ +# 1. Basis-Setup: Zertifikate und EPEL +RUN microdnf install -y --nodocs ca-certificates && \ + rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ microdnf update -y && \ microdnf install -y --nodocs \ - xz tar shadow-utils tzdata && \ + xz \ + tar \ + shadow-utils \ + tzdata && \ microdnf clean all # add s6 overlay diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 55aec12..ce302f7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -17,12 +17,15 @@ ARG BUILD_MAINTAINER LABEL build_version="${BUILD_MAINTAINER} version: ${BUILD_APP_VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="${BUILD_MAINTAINER}" -# 1. EPEL und Basis-Tools (shadow-utils ist kritisch für useradd!) -RUN microdnf install -y --nodocs \ - https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ +# 1. Basis-Setup: Zertifikate und EPEL +RUN microdnf install -y --nodocs ca-certificates && \ + rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ microdnf update -y && \ microdnf install -y --nodocs \ - xz tar shadow-utils tzdata && \ + xz \ + tar \ + shadow-utils \ + tzdata && \ microdnf clean all # 2. S6 Overlay hinzufügen (explizit für aarch64) From 90c1a914da29cc4edea0a14612f7a51efec53ce0 Mon Sep 17 00:00:00 2001 From: pi-farm Date: Tue, 17 Mar 2026 23:49:01 +0100 Subject: [PATCH 4/5] 4. --- Dockerfile | 6 ++++-- Dockerfile.aarch64 | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5410058..069f5eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,11 +58,13 @@ ENV HOME="/root" \ VIRTUAL_ENV=/lsiopy \ PATH="/lsiopy/bin:$PATH" -# 2. Pakete installieren +# 2. Pakete installieren (curl entfernt, da als curl-minimal bereits vorhanden) RUN echo "**** install packages ****" && \ microdnf install -y --nodocs \ glibc-all-langpacks \ - curl jq nmap-ncat cronie && \ + jq \ + nmap-ncat \ + cronie && \ microdnf clean all # 3. User und Verzeichnisse (getrennt vom Paket-Install!) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ce302f7..888a8dc 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -56,11 +56,13 @@ ENV HOME="/root" \ VIRTUAL_ENV=/lsiopy \ PATH="/lsiopy/bin:$PATH" -# 2. Pakete installieren +# 2. Pakete installieren (curl entfernt, da als curl-minimal bereits vorhanden) RUN echo "**** install packages ****" && \ microdnf install -y --nodocs \ glibc-all-langpacks \ - curl jq nmap-ncat cronie && \ + jq \ + nmap-ncat \ + cronie && \ microdnf clean all # 3. User und Verzeichnisse (getrennt vom Paket-Install!) From 4c4a1b8f0e8d55acf2a372dd9a3c803ae965b975 Mon Sep 17 00:00:00 2001 From: pi-farm Date: Tue, 17 Mar 2026 23:54:36 +0100 Subject: [PATCH 5/5] 5. --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 069f5eb..7207ee3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,7 +77,7 @@ RUN echo "**** create user and folders ****" && \ # 7. Lokale Skripte kopieren und Ausführungsrechte für S6 reparieren ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/stable.tar.gz /tmp -RUN tar -C / -Jxpf /tmp/stable.tar.gz && rm -rf /tmp/stable.tar.gz +RUN tar -C / -zxpf /tmp/stable.tar.gz && rm -rf /tmp/stable.tar.gz RUN find /etc/s6-overlay/s6-rc.d/ -type f \( -name "run" -o -name "up" \) -exec chmod +x {} + ENTRYPOINT ["/init"] \ No newline at end of file diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 888a8dc..c95fa8a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -75,7 +75,7 @@ RUN echo "**** create user and folders ****" && \ # 7. Lokale Skripte kopieren und Ausführungsrechte für S6 reparieren ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/stable.tar.gz /tmp -RUN tar -C / -Jxpf /tmp/stable.tar.gz && rm -rf /tmp/stable.tar.gz +RUN tar -C / -zxpf /tmp/stable.tar.gz && rm -rf /tmp/stable.tar.gz RUN find /etc/s6-overlay/s6-rc.d/ -type f \( -name "run" -o -name "up" \) -exec chmod +x {} + ENTRYPOINT ["/init"] \ No newline at end of file