From 44b3ccf545c1922528ef1443f141e9b695fea67a Mon Sep 17 00:00:00 2001
From: Sandro <mail@sandrodach.de>
Date: Sat, 24 Oct 2026 17:37:55 +0200
Subject: [PATCH] ci: use GITHUB_SERVER_URL and GITHUB_ACTOR env vars for
 registry login

---
 .gitea/workflows/build-and-publish.yaml | 26 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/build-and-publish.yaml b/.gitea/workflows/build-and-publish.yaml
index 11c5fd0..524295b 100644
--- a/.gitea/workflows/build-and-publish.yaml
+++ b/.gitea/workflows/build-and-publish.yaml
@@ -54,17 +54,25 @@ jobs:
       - name: Determine Registry & Docker Tag
         id: prep
         run: |
-          REGISTRY_HOST=$(echo "${{ gitea.server_url }}" | sed -E 's#^https?://##' | sed 's#/$##')
-          IMAGE_NAME=$(echo "${REGISTRY_HOST}/${{ gitea.repository }}" | tr '[:upper:]' '[:lower:]')
-          REF_NAME="${GITHUB_REF_NAME}"
+          SERVER_URL="${GITHUB_SERVER_URL:-https://git.dsit.me}"
+          REGISTRY_HOST=$(echo "${SERVER_URL}" | sed -E 's#^https?://##' | sed 's#/$##')
+          if [ -z "${REGISTRY_HOST}" ]; then
+            REGISTRY_HOST="git.dsit.me"
+          fi
+
+          REPO_PATH="${GITHUB_REPOSITORY:-sandrodach/mindsift}"
+          IMAGE_NAME=$(echo "${REGISTRY_HOST}/${REPO_PATH}" | tr '[:upper:]' '[:lower:]')
+          REF_NAME="${GITHUB_REF_NAME:-latest}"
+          ACTOR_NAME="${GITHUB_ACTOR:-sandrodach}"
 
           # Ersetze evtl. Slashes in Branch-Namen (z.B. rc/1.1 -> rc-1.1) für valide Docker-Tags
           DOCKER_TAG=$(echo "${REF_NAME}" | sed 's#/#-#g' | tr '[:upper:]' '[:lower:]')
 
-          echo "registry=${REGISTRY_HOST}" >> $GITHUB_OUTPUT
-          echo "image=${IMAGE_NAME}" >> $GITHUB_OUTPUT
-          echo "tag=${DOCKER_TAG}" >> $GITHUB_OUTPUT
-          echo "Building Docker image: ${IMAGE_NAME}:${DOCKER_TAG} (from ref: ${REF_NAME})"
+          echo "registry=${REGISTRY_HOST}" >> "$GITHUB_OUTPUT"
+          echo "image=${IMAGE_NAME}" >> "$GITHUB_OUTPUT"
+          echo "tag=${DOCKER_TAG}" >> "$GITHUB_OUTPUT"
+          echo "actor=${ACTOR_NAME}" >> "$GITHUB_OUTPUT"
+          echo "Building Docker image: ${IMAGE_NAME}:${DOCKER_TAG} (Registry: ${REGISTRY_HOST}, Actor: ${ACTOR_NAME})"
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -73,8 +81,8 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ steps.prep.outputs.registry }}
-          username: ${{ gitea.actor }}
-          password: ${{ secrets.PUSH_TOKEN || secrets.GITEA_TOKEN || gitea.token }}
+          username: ${{ steps.prep.outputs.actor }}
+          password: ${{ secrets.PUSH_TOKEN || secrets.GITEA_TOKEN || github.token }}
 
       - name: Build and Push Multi-Arch Image
         uses: docker/build-push-action@v6