pi-farm/docker-baseimage-alpine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix push to Dockerhub
Some checks failed
/ release-and-build (push) Failing after 56s
Details

Browse Source
This commit is contained in:
info@pi-farm.de
2026-02-14 00:20:56 +01:00
parent d38ac15f44
commit bb5589da0d
1 changed files with 95 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
.gitea/workflows/build-and-push.yaml
View File

@@ -253,121 +253,115 @@ jobs:
done done
- name: Update Documentation and Compose - name: Update Documentation and Compose
if: steps.check_changes.outputs.should_build == 'true' || gitea.event_name == 'push' id: update_doc
if: steps.check_changes.outputs.should_build == 'true'
run: | run: |
set -x # <--- AKTIVIERT DAS TRACING # --- 1. VARIABLEN VORBEREITEN ---
export TZ=Europe/Berlin export TZ=Europe/Berlin
CURRENT_TIME=$(date +'%d.%m.%Y %H:%M') CURRENT_TIME=$(date '+%d.%m.%Y %H:%M')
BUILD_DATE_ONLY=$(date +'%d.%m.%Y') BUILD_DATE_ONLY=$(date '+%d.%m.%Y')
BUILD_TAG=${{ steps.prep.outputs.docker_tag }}
FULL_URL=${{ steps.prep.outputs.image_name }}
REPO_PURE=${{ steps.prep.outputs.repo_pure }}
BASE_IMAGE=${{ steps.prep.outputs.base_image }}
# --- HIER IST DIE BRÜCKE: Outputs in Shell-Variablen laden --- if [ -f "Dockerfile.aarch64" ]; then
# Wir nutzen die Namen, die du im 'prep' Step definiert hast ARM_STATUS="✅ Aktiv (eigenes Dockerfile)"
BUILD_TAG="${{ steps.prep.outputs.docker_tag }}" else
FULL_URL="${{ steps.prep.outputs.image_name }}" ARM_STATUS="❌ Nicht unterstützt"
REPO_PURE="${{ steps.prep.outputs.repo_pure }}" fi
BASE_IMAGE="${{ steps.prep.outputs.base_image }}"
# Zusätzliche Info für ARM Status # Umgebungsvariablen laden
[ -f "Dockerfile.aarch64" ] && ARM_STATUS="✅ Aktiv (eigenes Dockerfile)" || ARM_STATUS="✅ Aktiv (via Standard Dockerfile)"
# Env laden für die Werteeretzung (z.B. für die Generatoren)
set -a set -a
source <(grep -v '^#' buildargs.env | sed 's/\r$//') source <(grep -v '^#' buildargs.env | sed 's/\r$//')
set +a set +a
# Commit Message Logik COMMIT_MSG=$(echo "${{ github.event.head_commit.message }}" | sed 's/\[skip ci\]//g' | xargs)
if [[ "${{ steps.prep.outputs.event_name }}" == "schedule" ]]; then
COMMIT_MSG="Automatischer Security-Rebuild"
else
COMMIT_MSG=$(git log -1 --pretty=%s --no-merges 2>/dev/null || echo "Manual build")
COMMIT_MSG=$(echo "$COMMIT_MSG" | sed 's/\[skip ci\]//g' | xargs)
fi
# Templates laden # --- 2. TEMPLATES LADEN ---
wget -q https://git.pi-farm.de/pi-farm/templates/raw/branch/main/README.template -O README.template || exit 1 wget -q https://git.pi-farm.de/pi-farm/templates/raw/branch/main/README.template -O README.template
wget -q https://git.pi-farm.de/pi-farm/templates/raw/branch/main/docker-compose.template -O docker-compose.template || true wget -q https://git.pi-farm.de/pi-farm/templates/raw/branch/main/docker-compose.template -O docker-compose.template
# History Update # --- 3. VERSION HISTORY UPDATE ---
NEW_ROW="| **v${BUILD_TAG}** | ${CURRENT_TIME} | ${COMMIT_MSG} ✅ |" NEW_ROW="| **$BUILD_TAG** | $CURRENT_TIME | $COMMIT_MSG ✅ |"
if [ -f "VERSION.history" ]; then if [ -f "VERSION.history" ]; then
grep -v "| **v${BUILD_TAG}** |" VERSION.history > VERSION.history.tmp || true grep -v "| **$BUILD_TAG** |" VERSION.history > VERSION.history.tmp
echo -e "${NEW_ROW}\n$(cat VERSION.history.tmp)" > VERSION.history echo "$NEW_ROW" > VERSION.history
cat VERSION.history.tmp >> VERSION.history
rm VERSION.history.tmp rm VERSION.history.tmp
else else
echo -e "${NEW_ROW}" > VERSION.history echo "$NEW_ROW" > VERSION.history
fi fi
HISTORY_CONTENT=$(cat VERSION.history) HISTORY_CONTENT=$(cat VERSION.history)
# --- GENERATOREN (Block-Bau) --- # --- 4. ENV / PORTS / VOL BLÖCKE GENERIEREN ---
# 1. Environment Block
ENV_BLOCK_CONTENT="" ENV_BLOCK_CONTENT=""
env_vars=$(grep '^ENV_' buildargs.env | grep -v '^#' | tr -d '\r' || true) env_vars=$(grep '^ENV_' buildargs.env | grep -v '^#' | tr -d '\r')
if [ ! -z "$env_vars" ]; then if [ ! -z "$env_vars" ]; then
ENV_BLOCK_CONTENT=" environment:\\n" # Header nur wenn Variablen da sind ENV_BLOCK_CONTENT=" environment:\n"
for line in $env_vars; do for line in $env_vars; do
key=$(echo "$line" | cut -d'=' -f1) key=$(echo $line | cut -d= -f1)
val="${!key}" val=$(echo $line | cut -d= -f2-)
clean_key=${key#ENV_} clean_key=${key#ENV_}
ENV_BLOCK_CONTENT="${ENV_BLOCK_CONTENT} - ${clean_key}=${val}\\n" ENV_BLOCK_CONTENT="${ENV_BLOCK_CONTENT} - ${clean_key}=${val}\n"
done done
fi fi
# 2. Ports Block
PORTS_BLOCK_CONTENT="" PORTS_BLOCK_CONTENT=""
port_vars=$(grep '^PORT_' buildargs.env | grep -v '^#' | tr -d '\r' || true) port_vars=$(grep '^PORT_' buildargs.env | grep -v '^#' | tr -d '\r' || true)
if [ ! -z "$port_vars" ]; then if [ ! -z "$port_vars" ]; then
PORTS_BLOCK_CONTENT=" ports:\\n" PORTS_BLOCK_CONTENT=" ports:\n"
for line in $port_vars; do for line in $port_vars; do
key=$(echo "$line" | cut -d'=' -f1) val=$(echo $line | cut -d= -f2-)
val="${!key}" PORTS_BLOCK_CONTENT="${PORTS_BLOCK_CONTENT} - ${val}\n"
PORTS_BLOCK_CONTENT="${PORTS_BLOCK_CONTENT} - \"${val}\"\\n"
done done
fi fi
# 3. Volumes Block
VOL_BLOCK_CONTENT="" VOL_BLOCK_CONTENT=""
vol_vars=$(grep '^VOL_' buildargs.env | grep -v '^#' | tr -d '\r' || true) vol_vars=$(grep '^VOL_' buildargs.env | grep -v '^#' | tr -d '\r' || true)
if [ ! -z "$vol_vars" ]; then if [ ! -z "$vol_vars" ]; then
VOL_BLOCK_CONTENT=" volumes:\\n" VOL_BLOCK_CONTENT=" volumes:\n"
for line in $vol_vars; do for line in $vol_vars; do
key=$(echo "$line" | cut -d'=' -f1) val=$(echo $line | cut -d= -f2-)
val="${!key}" VOL_BLOCK_CONTENT="${VOL_BLOCK_CONTENT} - ${val}\n"
VOL_BLOCK_CONTENT="${VOL_BLOCK_CONTENT} - ${val}\\n"
done done
fi fi
# DOCKER RUN GENERATOR # --- 5. DOCKER RUN BEFEHL GENERIEREN ---
RUN_CMD="docker run -d \\ \n --name ${REPO_PURE} \\ \n --restart unless-stopped" RUN_CMD="docker run -d \\ \n --name $REPO_PURE \\ \n --restart unless-stopped"
# Variablen aus buildargs.env für RUN-Befehl sammeln # Environment Args für Run Command
# Wir nutzen hier direkt die exportierten Werte
while read -r line; do while read -r line; do
[[ $line =~ ^PORT_ ]] && val="${line#*=}" && RUN_CMD="${RUN_CMD} \\ \n -p ${val}" if [[ "$line" =~ ^PORT_ ]]; then
if [[ $line =~ ^ENV_ ]]; then val=$(echo $line | cut -d= -f2-)
key="${line%%=*}"; clean_key="${key#ENV_}"; val="${!key}" RUN_CMD="${RUN_CMD} \\ \n -p ${val}"
elif [[ "$line" =~ ^ENV_ ]]; then
key=$(echo $line | cut -d= -f1)
clean_key=${key#ENV_}
val=$(echo $line | cut -d= -f2-)
RUN_CMD="${RUN_CMD} \\ \n -e ${clean_key}=${val}" RUN_CMD="${RUN_CMD} \\ \n -e ${clean_key}=${val}"
elif [[ "$line" =~ ^VOL_ ]]; then
val=$(echo $line | cut -d= -f2-)
RUN_CMD="${RUN_CMD} \\ \n -v ${val}"
fi fi
[[ $line =~ ^VOL_ ]] && val="${line#*=}" && RUN_CMD="${RUN_CMD} \\ \n -v ${val}"
done < <(grep -E '^(PORT_|ENV_|VOL_)' buildargs.env | grep -v '^#' | sed 's/\r$//') done < <(grep -E '^(PORT_|ENV_|VOL_)' buildargs.env | grep -v '^#' | sed 's/\r$//')
RUN_CMD="${RUN_CMD} \\ \n ${FULL_URL}:${BUILD_TAG}" RUN_CMD="${RUN_CMD} \\ \n $FULL_URL:$BUILD_TAG"
DOCKER_RUN_FINAL=$(echo -e "$RUN_CMD") DOCKER_RUN_FINAL=$(echo -e "$RUN_CMD")
# --- DOCKER HUB LINK GENERATOR --- # --- 6. DOCKER HUB LINK GENERATOR ---
DOCKERHUB_LINK_CONTENT="" DOCKERHUB_LINK_CONTENT=""
if [[ "$PUSH" == *"dockerhub"* ]]; then if [[ "$PUSH" == *"dockerhub"* ]]; then
DH_USER="${{ secrets.DOCKERHUB_USERNAME }}" DH_USER="${{ secrets.DOCKERHUB_USERNAME }}"
DOCKERHUB_LINK_CONTENT="[![Docker Hub](https://img.shields.io/badge/docker-hub-blue?logo=docker&logoColor=white)](https://hub.docker.com/r/${DH_USER}/${REPO_PURE})" DOCKERHUB_LINK_CONTENT="[![Docker Hub](https://img.shields.io/badge/docker-hub-blue?logo=docker&logoColor=white)](https://hub.docker.com/r/${DH_USER}/${REPO_PURE})"
fi fi
# --- TEMPLATE ENGINE (KORRIGIERT & ERWEITERT) --- # --- 7. TEMPLATE ENGINE FUNKTION ---
process_template() { process_template() {
local template=$1; local output=$2 local template=$1; local output=$2
if [ -f "$template" ]; then if [ -f "$template" ]; then
> "$output" > "$output"
while IFS= read -r line || [ -n "$line" ]; do while IFS= read -r line || [ -n "$line" ]; do
# 1. Standard Ersetzungen
line="${line//__REPO_NAME__/$REPO_PURE}" line="${line//__REPO_NAME__/$REPO_PURE}"
line="${line//__FULL_URL__/$FULL_URL}" line="${line//__FULL_URL__/$FULL_URL}"
line="${line//__BUILD_TAG__/$BUILD_TAG}" line="${line//__BUILD_TAG__/$BUILD_TAG}"
@@ -379,12 +373,6 @@ jobs:
line="${line//__DOCKERHUB_LINK__/$DOCKERHUB_LINK_CONTENT}" line="${line//__DOCKERHUB_LINK__/$DOCKERHUB_LINK_CONTENT}"
if [[ "$line" == *"__DESCRIPTION__"* ]]; then if [[ "$line" == *"__DESCRIPTION__"* ]]; then
# echo -e interpretiert das \n als echte neue Zeile
echo -e "${DESCRIPTION:-Keine Beschreibung.}" >> "$output"
# 2. Block Injection
if [[ "$line" == *"__DESCRIPTION__"* ]]; then
# echo -e interpretiert das \n als echte neue Zeile
echo -e "${DESCRIPTION:-Keine Beschreibung.}" >> "$output" echo -e "${DESCRIPTION:-Keine Beschreibung.}" >> "$output"
elif [[ "$line" == *"__ENV_BLOCK__"* ]]; then elif [[ "$line" == *"__ENV_BLOCK__"* ]]; then
[ -n "$ENV_BLOCK_CONTENT" ] && echo -e "${ENV_BLOCK_CONTENT}" >> "$output" [ -n "$ENV_BLOCK_CONTENT" ] && echo -e "${ENV_BLOCK_CONTENT}" >> "$output"
@@ -401,18 +389,18 @@ jobs:
fi fi
} }
# Templates verarbeiten (Compose ZUERST!)
process_template "docker-compose.template" "docker-compose.yml" process_template "docker-compose.template" "docker-compose.yml"
process_template "README.template" "README.md" process_template "README.template" "README.md"
# --- MULTILINE EXPORT FÜR NÄCHSTE STEPS --- # --- 8. EXPORTS FÜR NÄCHSTE STEPS ---
# Das ist die Gitea/GitHub Syntax für mehrzeilige Variablen echo "FINAL_MSG=$COMMIT_MSG" >> $GITHUB_ENV
# Multiline Export für DESCRIPTION
echo "DESCRIPTION<<EOF" >> $GITHUB_ENV echo "DESCRIPTION<<EOF" >> $GITHUB_ENV
echo -e "$DESCRIPTION" >> $GITHUB_ENV echo -e "$DESCRIPTION" >> $GITHUB_ENV
echo "EOF" >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV
echo "FINAL_MSG=$COMMIT_MSG" >> $GITHUB_ENV
echo "PUSH=$PUSH" >> $GITHUB_ENV
- name: Commit, Tag and Push Changes - name: Commit, Tag and Push Changes
if: steps.check_changes.outputs.should_build == 'true' if: steps.check_changes.outputs.should_build == 'true'
run: | run: |
@@ -424,6 +412,35 @@ jobs:
git push origin main git push origin main
git push -f origin "v${{ steps.prep.outputs.docker_tag }}" git push -f origin "v${{ steps.prep.outputs.docker_tag }}"
- name: Cleanup Temporary Tags on Docker Hub
if: steps.check_changes.outputs.should_build == 'true' && contains(env.PUSH, 'dockerhub')
run: |
echo "🧹 Aufräumen temporärer Docker Hub Tags..."
# 1. Login Token holen
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)
if [ "$TOKEN" != "null" ]; then
REPO_PURE=${{ steps.prep.outputs.repo_pure }}
DH_USER="${{ secrets.DOCKERHUB_USERNAME }}"
# 2. Lösche tmp-amd64
echo "Lösche $DH_USER/$REPO_PURE:tmp-amd64 ..."
curl -s -X DELETE "https://hub.docker.com/v2/repositories/${DH_USER}/${REPO_PURE}/tags/tmp-amd64/" \
-H "Authorization: JWT ${TOKEN}"
# 3. Lösche tmp-arm64
echo "Lösche $DH_USER/$REPO_PURE:tmp-arm64 ..."
curl -s -X DELETE "https://hub.docker.com/v2/repositories/${DH_USER}/${REPO_PURE}/tags/tmp-arm64/" \
-H "Authorization: JWT ${TOKEN}"
echo "✅ Temporäre Tags entfernt."
else
echo "⚠️ Konnte kein Token für Cleanup erhalten. Tags bleiben bestehen."
fi
- name: Cleanup Docker Artifacts - name: Cleanup Docker Artifacts
if: always() if: always()
run: docker image prune -f run: docker image prune -f