From ab4989acaffdd2172f7e02cb9720fcc6e05397c3 Mon Sep 17 00:00:00 2001
From: Dennis Oderwald <oderwald@2bros-group.com>
Date: Tue, 4 Nov 2025 18:01:36 +0100
Subject: [PATCH] GitHub Workflow updated

---
 .github/workflows/docker-publish.yml | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 329c3a6..baf8171 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -28,11 +28,30 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Determine Docker tags
+        id: vars
+        run: |
+          # Always tag with commit SHA
+          TAGS="ghcr.io/${{ github.repository_owner }}/opencloud-oidc-webfinger-proxy:${{ github.sha }}"
+
+          # If push to main → add :latest
+          if [[ "${GITHUB_REF_TYPE}" == "branch" && "${GITHUB_REF_NAME}" == "main" ]]; then
+            TAGS="$TAGS,ghcr.io/${{ github.repository_owner }}/opencloud-oidc-webfinger-proxy:latest"
+          fi
+
+          # If push of a version tag → add version tag (e.g. v1.0.0)
+          if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
+            VERSION_TAG=${GITHUB_REF_NAME}
+            TAGS="$TAGS,ghcr.io/${{ github.repository_owner }}/opencloud-oidc-webfinger-proxy:${VERSION_TAG}"
+          fi
+
+          echo "TAGS=$TAGS" >> $GITHUB_ENV
+          echo "Docker tags to push:"
+          echo "$TAGS" | tr ',' '\n'
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           push: true
-          tags: |
-            ghcr.io/${{ github.repository_owner }}/opencloud-oidc-webfinger-proxy:latest
-            ghcr.io/${{ github.repository_owner }}/opencloud-oidc-webfinger-proxy:${{ github.sha }}
-          platforms: linux/amd64,linux/arm64
+          tags: ${{ env.TAGS }}
+          platforms: linux/amd64,linux/arm64
\ No newline at end of file