From 158ac20c19bfae38fef216fa0a62282fea86820b Mon Sep 17 00:00:00 2001
From: Stein Helge Riise <stein.helge.riise@gmail.com>
Date: Mon, 23 Feb 2026 11:50:38 +0100
Subject: [PATCH] ci: simplify docker publish workflow for gitea runner

---
 .gitea/workflows/docker-publish.yml | 47 ++++++++++++-----------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/.gitea/workflows/docker-publish.yml b/.gitea/workflows/docker-publish.yml
index c49405f..9f6325f 100644
--- a/.gitea/workflows/docker-publish.yml
+++ b/.gitea/workflows/docker-publish.yml
@@ -16,24 +16,10 @@ env:
 jobs:
   publish-images:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set image tags
-        id: meta
-        shell: bash
-        run: |
-          short_sha="$(git rev-parse --short=12 HEAD)"
-          echo "short_sha=$short_sha" >> "$GITHUB_OUTPUT"
-          if tag_name="$(git describe --tags --exact-match 2>/dev/null)"; then
-            echo "version_tag=$tag_name" >> "$GITHUB_OUTPUT"
-          else
-            echo "version_tag=sha-$short_sha" >> "$GITHUB_OUTPUT"
-          fi
-
       - name: Login to registry
         shell: bash
         env:
@@ -44,24 +30,31 @@ jobs:
           test -n "$REGISTRY_PASSWORD"
           echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY" -u "$REGISTRY_USER" --password-stdin
 
-      - name: Build and push web image
+      - name: Build and push images
         shell: bash
         run: |
-          docker build \
-            -f Dockerfile \
-            -t "$IMAGE_WEB:${{ steps.meta.outputs.version_tag }}" \
-            -t "$IMAGE_WEB:latest" \
-            .
-          docker push "$IMAGE_WEB:${{ steps.meta.outputs.version_tag }}"
-          docker push "$IMAGE_WEB:latest"
+          short_sha="$(git rev-parse --short=12 HEAD)"
+          if tag_name="$(git describe --tags --exact-match 2>/dev/null)"; then
+            version_tag="$tag_name"
+          else
+            version_tag="sha-$short_sha"
+          fi
+
+          echo "Publishing tags: $version_tag, latest"
 
-      - name: Build and push lobby image
-        shell: bash
-        run: |
           docker build \
             -f Dockerfile.lobby \
-            -t "$IMAGE_LOBBY:${{ steps.meta.outputs.version_tag }}" \
+            -t "$IMAGE_LOBBY:$version_tag" \
             -t "$IMAGE_LOBBY:latest" \
             .
-          docker push "$IMAGE_LOBBY:${{ steps.meta.outputs.version_tag }}"
+
+          docker build \
+            -f Dockerfile \
+            -t "$IMAGE_WEB:$version_tag" \
+            -t "$IMAGE_WEB:latest" \
+            .
+
+          docker push "$IMAGE_LOBBY:$version_tag"
           docker push "$IMAGE_LOBBY:latest"
+          docker push "$IMAGE_WEB:$version_tag"
+          docker push "$IMAGE_WEB:latest"