9.3 [skip ci]

Reviewed-on: #2

.gitea/workflows/build-and-push.yaml

@@ -371,11 +371,27 @@ jobs:
         run: |
           git config --local user.email "action@pi-farm.de"
           git config --local user.name "Gitea Action"
+          
+          # Sicherstellen, dass wir etwas zum Committen haben
           git add VERSION.history README.md docker-compose.yml
+          
+          # Nur committen, wenn es Änderungen gibt
           git diff --quiet && git diff --staged --quiet || git commit -m "${{ env.FINAL_MSG }} [skip ci]"
-          git tag -f "v${{ steps.prep.outputs.docker_tag }}"
-          git push origin main
-          git push -f origin "v${{ steps.prep.outputs.docker_tag }}"
+          
+          # Das Tag exakt so setzen, wie es in prep definiert wurde (ohne extra 'v')
+          TARGET_TAG="${{ steps.prep.outputs.docker_tag }}"
+          git tag -f "$TARGET_TAG"
+          
+          if [[ "${{ gitea.ref }}" == refs/tags/* ]]; then
+            echo "🏷️ Build aus Tag getriggert: $TARGET_TAG"
+            # Wir pushen das Tag (force), um die Doku-Updates einzuschließen
+            git push -f origin "$TARGET_TAG"
+          else
+            echo "🌿 Build aus Branch/Schedule getriggert: ${{ gitea.ref_name }}"
+            # In den Branch pushen (HEAD:branch_name) und das Tag setzen
+            git push origin HEAD:${{ gitea.ref_name }}
+            git push -f origin "$TARGET_TAG"
+          fi
 
       - name: Cleanup Temporary Tags on Docker Hub
         if: steps.check_changes.outputs.should_build == 'true' && contains(steps.prep.outputs.push_targets, 'dockerhub')

Dockerfile

@@ -76,8 +76,8 @@ RUN echo "**** create user and folders ****" && \
     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 
-RUN tar -C / -zxpf /tmp/stable.tar.gz && rm -rf /tmp/stable.tar.gz
+ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/new-stable.tar.gz /tmp 
+RUN tar -C /etc/ -zxpf /tmp/new-stable.tar.gz && rm -rf /tmp/new-stable.tar.gz
 RUN find /etc/s6-overlay/s6-rc.d/ -type f \( -name "run" -o -name "up" \) -exec chmod +x {} +
 
 ENTRYPOINT ["/init"]

Dockerfile.aarch64

@@ -74,8 +74,8 @@ RUN echo "**** create user and folders ****" && \
     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 
-RUN tar -C / -zxpf /tmp/stable.tar.gz && rm -rf /tmp/stable.tar.gz
+ADD https://git.pi-farm.de/pi-farm/s6-overlay/archive/new-stable.tar.gz /tmp 
+RUN tar -C /etc/ -zxpf /tmp/new-stable.tar.gz && rm -rf /tmp/new-stable.tar.gz
 RUN find /etc/s6-overlay/s6-rc.d/ -type f \( -name "run" -o -name "up" \) -exec chmod +x {} +
 
 ENTRYPOINT ["/init"]

README.md

@@ -1,16 +1,53 @@
-# Projekt: {{.RepoName}} [![Build Status](https://git.pi-farm.de/{{.Owner.Name}}/{{.RepoName}}/actions/workflows/build-and-push.yaml/badge.svg)](https://git.pi-farm.de/{{.Owner.Name}}/{{.RepoName}}/actions)
+# docker-baseimage-rhel
+This is a RHEL (UBI) based image with s6-overlay.
+Based on the great work of Linuxserver.io
+
+[![Build Status](https://git.pi-farm.de/pi-farm/docker-baseimage-rhel/actions/workflows/build-and-push.yaml/badge.svg)](https://git.pi-farm.de/pi-farm/docker-baseimage-rhel/actions)
+[![Gitea Repo](https://img.shields.io/badge/gitea-repository-blue?logo=gitea&logoColor=white)](__REPO_URL__)
 
 This repository is built and pushed automatically.
 
-### 🏗️ Platform Support
-| Architecture | Status | Base-Image |
-| :--- | :--- | :--- |
-| **x86_64** (amd64) | ✅ Active | `__BASE_IMAGE__` |
-| **aarch64** (arm64) | __ARM_STATUS__ | `__BASE_IMAGE__` |
 
-### 🚀 Docker Pull Command
+
+### 🏗️ Platform Support
+| Architecture | Status | Base Image | Build Date |
+| :--- | :--- | :--- | :--- |
+| x86_64 (amd64) | ✅ Active | registry.access.redhat.com/ubi9/ubi-minimal:9.3 | 23.03.2026 21:23 |
+| aarch64 (arm64) | ✅ Active | registry.access.redhat.com/ubi9/ubi-minimal:9.3 | 23.03.2026 21:23 |
+
+### 🚀 Docker Pull
 ```bash
-docker pull git.pi-farm.de/{{.Owner.Name}}/{{.RepoName}}:latest
+docker pull git.pi-farm.de/pi-farm/docker-baseimage-rhel:latest
 ```
----
-*Last updated on: __DATE__*
+### 🚀 Docker Compose
+```yaml
+services:
+  docker-baseimage-rhel:
+    image: git.pi-farm.de/pi-farm/docker-baseimage-rhel:latest
+    container_name: docker-baseimage-rhel
+    restart: unless-stopped
+
+    environment:
+      - TZ=Europe/Berlin
+      - PUID=1000
+      - PGID=1000
+
+```
+### 🚀 Docker Run
+```bash
+docker run -d \
+  --name docker-baseimage-rhel \
+  --restart unless-stopped \
+  -e TZ=Europe/Berlin \
+  -e PUID=1000 \
+  -e PGID=1000 \
+  git.pi-farm.de/pi-farm/docker-baseimage-rhel:latest
+```
+
+*Last updated on: 23.03.2026 21:23*
+
+### 📜 Version History
+| Version | Date | Status |
+| :--- | :--- | :--- |
+| **latest** | 23.03.2026 21:23 | 9.3 ✅ |
+| **latest** | 23.03.2026 21:13 | 9.3 ✅ |

VERSION.history

@@ -0,0 +1,3 @@
+| **latest** | 23.03.2026 21:23 | 9.3 ✅ |
+| **latest** | 23.03.2026 21:13 | 9.3 ✅ |
+

buildargs.env

@@ -1,8 +1,8 @@
 ## BUILD STAGE
 BUILD_BASE_TAG=9.3
-BUILD_TAG_LATEST=y
+BUILD_TAG_LATEST=n
 # Wir nutzen UBI Minimal für ein kleines Image
-BUILD_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest
+BUILD_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:${BUILD_BASE_TAG}
 
 BUILD_RHEL_ARCH=x86_64
 BUILD_RHEL_ARCH_AARCH64=aarch64

docker-compose.yml

@@ -1 +1,11 @@
+services:
+  docker-baseimage-rhel:
+    image: git.pi-farm.de/pi-farm/docker-baseimage-rhel:latest
+    container_name: docker-baseimage-rhel
+    restart: unless-stopped
+
+    environment:
+      - TZ=Europe/Berlin
+      - PUID=1000
+      - PGID=1000