switch to s6-overlay version 3.2.2.0 [skip ci]

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

@@ -1,11 +1,11 @@
 on:
   push:
     branches:
-      - 'main'
+      - "main"
     tags:
-      - '*'
+      - "*"
   schedule:
-    - cron: '0 5 * * 0'
+    - cron: "0 5 * * 0"
   workflow_dispatch:
 
 jobs:
@@ -22,28 +22,32 @@ jobs:
         id: prep
         run: |
           export TZ=Europe/Berlin
-          
+
           set -a
           source <(grep -v '^#' buildargs.env | sed 's/\r$//')
           set +a
-          
+
           echo "push_targets=$PUSH" >> $GITHUB_OUTPUT
 
+          LATEST_FLAG="${BUILD_TAG_LATEST:-n}"
+          LATEST_FLAG_LOWER=$(echo "$LATEST_FLAG" | tr '[:upper:]' '[:lower:]')
+          echo "tag_latest=$LATEST_FLAG_LOWER" >> $GITHUB_OUTPUT
+
           ARGS_HASH=$(grep "^BUILD_" buildargs.env | sha256sum | cut -d' ' -f1)
           echo "build_args_hash=$ARGS_HASH" >> $GITHUB_OUTPUT
-          
+
           echo "event_name=${{ gitea.event_name }}" >> $GITHUB_OUTPUT
-          
+
           if [[ "${{ gitea.ref }}" == refs/tags/* ]]; then
             CLEAN_TAG=${{ gitea.ref_name }}
             echo "docker_tag=${CLEAN_TAG#v}" >> $GITHUB_OUTPUT
           else
             echo "docker_tag=${BUILD_TAG:-latest}" >> $GITHUB_OUTPUT
           fi
-          
+
           OWNER=$(echo "${{ gitea.repository }}" | cut -d'/' -f1 | tr '[:upper:]' '[:lower:]')
           REPO_NAME=$(echo "${{ gitea.repository }}" | cut -d'/' -f2 | tr '[:upper:]' '[:lower:]')
-          
+
           echo "repo_pure=$REPO_NAME" >> $GITHUB_OUTPUT
           echo "image_name=git.pi-farm.de/$OWNER/$REPO_NAME" >> $GITHUB_OUTPUT
           echo "base_image=$BUILD_BASE_IMAGE" >> $GITHUB_OUTPUT
@@ -64,17 +68,17 @@ jobs:
           LOCAL_ARGS_HASH="${{ steps.prep.outputs.build_args_hash }}"
 
           echo "🔍 Check Remote-Registry..."
-          
+
           if [[ "${{ steps.prep.outputs.event_name }}" != "schedule" ]]; then
             echo "🚀 Start: Build forced."
           else
             REMOTE_BASE_SHA=$(docker buildx imagetools inspect "$BASE" --format '{{json .Manifest.Digest}}' 2>/dev/null | tr -d '"' || echo "")
-            
+
             if [ -z "$REMOTE_BASE_SHA" ]; then
                echo "⚠️ Base-Image SHA not readable. Build process started."
             else
                RAW_INDEX=$(docker buildx imagetools inspect "$IMAGE:$TAG" --raw 2>/dev/null || echo "")
-               
+
                if [ -z "$RAW_INDEX" ]; then
                   echo "🆕 Image doesn't exist. Build required."
                else
@@ -100,7 +104,7 @@ jobs:
       - name: Set up Docker Buildx
         if: steps.check_changes.outputs.should_build == 'true'
         uses: docker/setup-buildx-action@v3
-        
+
       - name: Login to Docker Hub
         if: contains(steps.prep.outputs.push_targets, 'dockerhub')
         uses: https://github.com/docker/login-action@v3
@@ -116,7 +120,10 @@ jobs:
           ARGS_HASH=${{ steps.prep.outputs.build_args_hash }}
           BASE=${{ steps.prep.outputs.base_image }}
           REPO_PURE=${{ steps.prep.outputs.repo_pure }}
-          
+
+          # NEU: Wir laden unser Flag rein
+          TAG_LATEST="${{ steps.prep.outputs.tag_latest }}"
+
           set -a
           source <(grep -v '^#' buildargs.env | sed 's/\r$//')
           set +a
@@ -126,7 +133,7 @@ jobs:
           for k in $keys; do
             DOCKER_ARGS+=("--build-arg" "$k=${!k}")
           done
-          
+
           BASE_SHA=$(docker buildx imagetools inspect $BASE --format '{{json .Manifest.Digest}}' 2>/dev/null | tr -d '"' || echo "unknown")
 
           AMD_TAGS=("-t" "$IMAGE_GITEA:tmp-amd64")
@@ -141,20 +148,38 @@ jobs:
           docker buildx build "${DOCKER_ARGS[@]}" "${AMD_TAGS[@]}" \
             --pull --platform linux/amd64 -f Dockerfile \
             --label "pi_farm.base_digest=$BASE_SHA" --label "pi_farm.args_hash=$ARGS_HASH" --push .
-          
+
           docker buildx build "${DOCKER_ARGS[@]}" "${ARM_TAGS[@]}" \
             --pull --platform linux/arm64 -f Dockerfile.aarch64 \
             --label "pi_farm.base_digest=$BASE_SHA" --label "pi_farm.args_hash=$ARGS_HASH" --push .
-          
+
+          # --- NEU: Dynamische Tags für Gitea ---
+          GITEA_TAGS=("-t" "$IMAGE_GITEA:$TAG")
+          if [ "$TAG_LATEST" == "y" ]; then
+            GITEA_TAGS+=("-t" "$IMAGE_GITEA:latest")
+            echo "🏷️ Gitea: 'latest' tag will be set."
+          else
+            echo "ℹ️ Gitea: 'latest' tag will not be set."
+          fi
+
           docker buildx imagetools create \
             --annotation "index:pi_farm.base_digest=$BASE_SHA" --annotation "index:pi_farm.args_hash=$ARGS_HASH" \
-            -t $IMAGE_GITEA:$TAG -t $IMAGE_GITEA:latest $IMAGE_GITEA:tmp-amd64 $IMAGE_GITEA:tmp-arm64
+            "${GITEA_TAGS[@]}" $IMAGE_GITEA:tmp-amd64 $IMAGE_GITEA:tmp-arm64
 
           if [[ "$PUSH" == *"dockerhub"* ]]; then
             DOCKERHUB_REPO="${{ secrets.DOCKERHUB_USERNAME }}/$REPO_PURE"
+
+            DH_TAGS=("-t" "$DOCKERHUB_REPO:$TAG")
+            if [ "$TAG_LATEST" == "y" ]; then
+              DH_TAGS+=("-t" "$DOCKERHUB_REPO:latest")
+              echo "🏷️ Docker Hub: 'latest' tag will be set."
+            else
+              echo "ℹ️ Docker Hub: 'latest' tag will not be set."
+            fi
+
             docker buildx imagetools create \
               --annotation "index:pi_farm.base_digest=$BASE_SHA" --annotation "index:pi_farm.args_hash=$ARGS_HASH" \
-              -t $DOCKERHUB_REPO:$TAG -t $DOCKERHUB_REPO:latest $IMAGE_GITEA:tmp-amd64 $IMAGE_GITEA:tmp-arm64
+              "${DH_TAGS[@]}" $IMAGE_GITEA:tmp-amd64 $IMAGE_GITEA:tmp-arm64
           fi
 
       - name: Update Documentation and Compose
@@ -162,7 +187,7 @@ jobs:
         if: steps.check_changes.outputs.should_build == 'true'
         run: |
           set -x
-          
+
           # --- 1. VARIABLEN VORBEREITEN ---
           export TZ=Europe/Berlin
           CURRENT_TIME=$(date '+%d.%m.%Y %H:%M')
@@ -170,7 +195,7 @@ jobs:
           FULL_URL="${{ steps.prep.outputs.image_name }}"
           REPO_PURE="${{ steps.prep.outputs.repo_pure }}"
           BASE_IMAGE="${{ steps.prep.outputs.base_image }}"
-          
+
           if [ ! -f "buildargs.env" ]; then echo "❌ buildargs.env missing!"; exit 1; fi
 
           grep -v '^#' buildargs.env | sed 's/\r$//' > cleaned_env.sh
@@ -179,7 +204,7 @@ jobs:
           set +a
 
           if [ -f "Dockerfile.aarch64" ]; then ARM_STATUS="✅ Active"; else ARM_STATUS="❌ Not supported"; fi
-          
+
           cat << 'EOF' > commit_msg.txt
           ${{ gitea.event.head_commit.message }}
           EOF
@@ -239,7 +264,7 @@ jobs:
             echo "docker run -d \\"
             echo "  --name $REPO_PURE \\"
             echo "  --restart unless-stopped \\"
-            
+
             all_params=$(grep -E '^(PORT_|ENV_|VOL_)' buildargs.env | grep -v '^#' | sed 's/\r$//' || true)
             if [ -n "$all_params" ]; then
               while read -r line; do
@@ -272,7 +297,7 @@ jobs:
             local template=$1; local output=$2
             [ ! -f "$template" ] && return
             cp "$template" "$output"
-            
+
             # Simple Ersetzungen
             sed -i "s|__REPO_NAME__|$REPO_PURE|g" "$output"
             sed -i "s|__FULL_URL__|$FULL_URL|g" "$output"
@@ -280,7 +305,7 @@ jobs:
             sed -i "s|__BASE_IMAGE__|$BASE_IMAGE|g" "$output"
             sed -i "s|__ARM_STATUS__|$ARM_STATUS|g" "$output"
             sed -i "s|__CURRENT_DATE__|$CURRENT_TIME|g" "$output"
-            
+
             # Komplexe Blöcke: AWK für Strings, SED für Files
             awk -v r="$HISTORY_CONTENT" '{gsub(/__HISTORY_CONTENT__/, r)}1' "$output" > "$output.tmp" && mv "$output.tmp" "$output"
             awk -v r="$DOCKERHUB_LINK_CONTENT" '{gsub(/__DOCKERHUB_LINK__/, r)}1' "$output" > "$output.tmp" && mv "$output.tmp" "$output"
@@ -289,19 +314,19 @@ jobs:
             if grep -q "__DOCKER_RUN__" "$output" && [ -f "docker_run_block.txt" ]; then
                sed -e '/__DOCKER_RUN__/{r docker_run_block.txt' -e 'd;}' "$output" > "$output.tmp" && mv "$output.tmp" "$output"
             fi
-            
+
             # Compose Block via File einfügen
             if grep -q "__COMPOSE_BLOCK__" "$output" && [ -f "docker-compose.yml" ]; then
                sed -e '/__COMPOSE_BLOCK__/{r docker-compose.yml' -e 'd;}' "$output" > "$output.tmp" && mv "$output.tmp" "$output"
             fi
-            
+
             # ENV/PORTS/VOL Blöcke
             if grep -q "__ENV_BLOCK__" "$output"; then
                awk -v r="$(echo -e "$ENV_BLOCK_CONTENT")" '{gsub(/__ENV_BLOCK__/, r)}1' "$output" > "$output.tmp" && mv "$output.tmp" "$output"
             fi
             awk -v r="$(echo -e "$PORTS_BLOCK_CONTENT")" '{gsub(/__PORTS_BLOCK__/, r)}1' "$output" > "$output.tmp" && mv "$output.tmp" "$output"
             awk -v r="$(echo -e "$VOL_BLOCK_CONTENT")" '{gsub(/__VOL_BLOCK__/, r)}1' "$output" > "$output.tmp" && mv "$output.tmp" "$output"
-            
+
              # Description als letztes
             if grep -q "__DESCRIPTION__" "$output"; then
                awk -v r="$(echo -e "${DESCRIPTION:-Keine Beschreibung.}")" '{gsub(/__DESCRIPTION__/, r)}1' "$output" > "$output.tmp" && mv "$output.tmp" "$output"
@@ -310,13 +335,13 @@ jobs:
 
           process_template "docker-compose.template" "docker-compose.yml"
           process_template "README.template" "README.md"
-          
+
           # --- 8. EXPORTS ---
           echo "FINAL_MSG=$COMMIT_MSG" >> $GITHUB_ENV
           echo "DESCRIPTION<<EOF" >> $GITHUB_ENV
           echo -e "$DESCRIPTION" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
-          
+
       - name: Push README to Docker Hub
         if: steps.check_changes.outputs.should_build == 'true' && contains(steps.prep.outputs.push_targets, 'dockerhub')
         run: |
@@ -337,7 +362,7 @@ jobs:
 
           REPO_PURE="${{ steps.prep.outputs.repo_pure }}"
           DH_USER="${{ secrets.DOCKERHUB_USERNAME }}"
-          
+
           SHORT_DESC=$(echo -e "${{ env.DESCRIPTION }}" | head -n 1 | cut -c 1-100)
           [ -z "$SHORT_DESC" ] && SHORT_DESC="Docker Image for $REPO_PURE"
 
@@ -385,7 +410,7 @@ jobs:
           fi
 
           echo "🧹 Cleanup temp. Docker Hub tags..."
-          
+
           TOKEN=$(curl -s -X POST "https://hub.docker.com/v2/users/login/" \
             -H "Content-Type: application/json" \
             -d "{\"username\": \"${{ secrets.DOCKERHUB_USERNAME }}\", \"password\": \"${{ secrets.DOCKERHUB_TOKEN }}\"}" | jq -r .token)
@@ -393,7 +418,7 @@ jobs:
           if [ "$TOKEN" != "null" ] && [ -n "$TOKEN" ]; then
             REPO_PURE=${{ steps.prep.outputs.repo_pure }}
             DH_USER="${{ secrets.DOCKERHUB_USERNAME }}"
-            
+
             for t in tmp-amd64 tmp-arm64; do
               echo "Deleting tag $t..."
               STATUS=$(curl -s -o /dev/null -w "%{http_code}" -X DELETE \
@@ -407,20 +432,20 @@ jobs:
       - name: Cleanup Temporary Registry Tags (Gitea)
         if: steps.check_changes.outputs.should_build == 'true'
         run: |
-            TOKEN="${{ secrets.GIT_TOKEN }}"
-            ORG_NAME=$(echo "${{ gitea.repository }}" | cut -d'/' -f1)
-            REPO_NAME=$(echo "${{ gitea.repository }}" | cut -d'/' -f2)
-            
-            for t in tmp-amd64 tmp-arm64; do
-              curl -s -X DELETE "https://git.pi-farm.de/api/v1/packages/$ORG_NAME/container/$REPO_NAME/$t" -H "Authorization: token $TOKEN"
-              curl -s -X DELETE "https://git.pi-farm.de/api/v1/packages/${ORG_NAME,,}/container/${REPO_NAME,,}/$t" -H "Authorization: token $TOKEN"
-            done
+          TOKEN="${{ secrets.GIT_TOKEN }}"
+          ORG_NAME=$(echo "${{ gitea.repository }}" | cut -d'/' -f1)
+          REPO_NAME=$(echo "${{ gitea.repository }}" | cut -d'/' -f2)
+
+          for t in tmp-amd64 tmp-arm64; do
+            curl -s -X DELETE "https://git.pi-farm.de/api/v1/packages/$ORG_NAME/container/$REPO_NAME/$t" -H "Authorization: token $TOKEN"
+            curl -s -X DELETE "https://git.pi-farm.de/api/v1/packages/${ORG_NAME,,}/container/${REPO_NAME,,}/$t" -H "Authorization: token $TOKEN"
+          done
 
       - name: Cleanup Docker Artifacts
         if: always()
         run: docker image prune -f
-      
+
       - name: Workflow Summary
         if: always()
         run: |
-          echo "Check completed. Build was: ${{ steps.check_changes.outputs.should_build }}"
+          echo "Check completed. Build was: ${{ steps.check_changes.outputs.should_build }}"

README.md

@@ -12,8 +12,8 @@ This repository is built and pushed automatically.
 ### 🏗️ Platform Support
 | Architecture | Status | Base Image | Build Date |
 | :--- | :--- | :--- | :--- |
-| x86_64 (amd64) | ✅ Active | alpine:3.23 | 18.02.2026 00:55 |
-| aarch64 (arm64) | ✅ Active | alpine:3.23 | 18.02.2026 00:55 |
+| x86_64 (amd64) | ✅ Active | alpine:3.23 | 25.02.2026 15:26 |
+| aarch64 (arm64) | ✅ Active | alpine:3.23 | 25.02.2026 15:26 |
 
 ### 🚀 Docker Pull
 ```bash
@@ -44,15 +44,17 @@ docker run -d \
   git.pi-farm.de/pi-farm/docker-baseimage-alpine:3.23
 ```
 
-*Last updated on: 18.02.2026 00:55*
+*Last updated on: 25.02.2026 15:26*
 
 ### 📜 Version History
 | Version | Date | Status |
 | :--- | :--- | :--- |
-| **3.23** | 18.02.2026 00:55 | update workflow to fix docker run syntax ✅ |
-| **3.23** | 18.02.2026 00:14 | edit workflow ✅ |
-| **3.23** | 18.02.2026 00:10 | update on buildargs.env ✅ |
-| **3.23** | 18.02.2026 00:00 |  ✅ |
-| **3.23** | 17.02.2026 23:50 |  ✅ |
+| **3.23** | 25.02.2026 15:26 | switch to s6-overlay version 3.2.2.0 ✅ |
+| **3.23** | 19.02.2026 23:08 | test fix for latest-tag in workflow on building v3.23 ✅ |
+| **3.22** | 19.02.2026 23:02 | add fix for latest-tag in workflow ✅ |
+| **3.23** | 19.02.2026 21:20 | build for alpine v3.23 ✅ |
+| **3.21** | 19.02.2026 21:16 | build for alpine v3.21 ✅ |
+| **3.23** | 19.02.2026 20:47 | build for v3.23 ✅ |
+| **3.22** | 19.02.2026 20:42 | build for alpine v3.22 ✅ |
 | **3.23** | 17.02.2026 23:44 | update on Readme.md and workflow ✅ |
 | **3.23** | 14.02.2026 01:06 | alpine 3.23 ✅ |

VERSION.history

@@ -1,7 +1,9 @@
-| **3.23** | 18.02.2026 00:55 | update workflow to fix docker run syntax ✅ |
-| **3.23** | 18.02.2026 00:14 | edit workflow ✅ |
-| **3.23** | 18.02.2026 00:10 | update on buildargs.env ✅ |
-| **3.23** | 18.02.2026 00:00 |  ✅ |
-| **3.23** | 17.02.2026 23:50 |  ✅ |
+| **3.23** | 25.02.2026 15:26 | switch to s6-overlay version 3.2.2.0 ✅ |
+| **3.23** | 19.02.2026 23:08 | test fix for latest-tag in workflow on building v3.23 ✅ |
+| **3.22** | 19.02.2026 23:02 | add fix for latest-tag in workflow ✅ |
+| **3.23** | 19.02.2026 21:20 | build for alpine v3.23 ✅ |
+| **3.21** | 19.02.2026 21:16 | build for alpine v3.21 ✅ |
+| **3.23** | 19.02.2026 20:47 | build for v3.23 ✅ |
+| **3.22** | 19.02.2026 20:42 | build for alpine v3.22 ✅ |
 | **3.23** | 17.02.2026 23:44 | update on Readme.md and workflow ✅ |
 | **3.23** | 14.02.2026 01:06 | alpine 3.23 ✅ |

buildargs.env

@@ -1,4 +1,5 @@
 BUILD_TAG=3.23
+BUILD_TAG_LATEST=y
 BUILD_BASE_IMAGE=alpine:${BUILD_TAG}
 # Examples for BASE_IMAGE
 # alpine:${BUILD_TAG}
@@ -7,7 +8,7 @@ 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_S6_OVERLAY_VERSION=3.2.2.0
 BUILD_MAINTAINER=pi-farm
 BUILD_APP_VERSION=v${BUILD_TAG}
 BUILD_APP_NAME=baseimage-alpine

root/etc/s6-overlay/s6-rc.d/init-adduser/run

@@ -5,13 +5,13 @@ PUID=${PUID:-911}
 PGID=${PGID:-911}
 
 if [[ -z ${LSIO_READ_ONLY_FS} ]] && [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-    USERHOME=$(grep abc /etc/passwd | cut -d ":" -f6)
-    usermod -d "/root" abc
+    USERHOME=$(grep pi /etc/passwd | cut -d ":" -f6)
+    usermod -d "/root" pi
 
-    groupmod -o -g "${PGID}" abc
-    usermod -o -u "${PUID}" abc
+    groupmod -o -g "${PGID}" pi
+    usermod -o -u "${PUID}" pi
 
-    usermod -d "${USERHOME}" abc
+    usermod -d "${USERHOME}" pi
 fi
 
 if { [[ -z ${LSIO_READ_ONLY_FS} ]] && [[ -z ${LSIO_NON_ROOT_USER} ]]; } || [[ ! ${LSIO_FIRST_PARTY} = "true" ]]; then
@@ -26,8 +26,8 @@ GID/UID
 ───────────────────────────────────────'
 if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
 echo "
-User UID:    $(id -u abc)
-User GID:    $(id -g abc)
+User UID:    $(id -u pi)
+User GID:    $(id -g pi)
 ───────────────────────────────────────"
 else
 echo "
@@ -43,7 +43,7 @@ if [[ -f /build_version ]]; then
 fi
 
 if [[ -z ${LSIO_READ_ONLY_FS} ]] && [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-    lsiown abc:abc /app
-    lsiown abc:abc /config
-    lsiown abc:abc /defaults
+    lsiown pi:pi /app
+    lsiown pi:pi /config
+    lsiown pi:pi /defaults
 fi