Refactor

Author: mpysiak

.github/workflows/build_and_publish.yml

@@ -1,4 +1,4 @@
-name: Build and Publish Demo Image
+name: Build and Push Docker Image (Branch-Aware Tags)
 
 on:
     push:
@@ -30,28 +30,37 @@ jobs:
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Extract version info
+            - name: Extract version info (tag or branch fallback)
               id: version
               run: |
                   if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
                     git fetch --tags
-                    TAG_NAME=$(git describe --tags "$(git rev-list --tags --max-count=1)")
+                    BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+                  
+                    TAG_NAME=$(git describe --tags --abbrev=0 "$(git rev-list --tags --no-walk --branches=$BRANCH_NAME | head -n 1)" 2>/dev/null || true)
+                  
+                    if [[ -z "$TAG_NAME" ]]; then
+                      TAG_NAME="${BRANCH_NAME//\//-}"  # sanitize: replace slashes with dashes
+                    fi
                   else
                     TAG_NAME="${GITHUB_REF#refs/tags/}"
                   fi
                   
                   MAJOR_MINOR=$(echo "$TAG_NAME" | cut -d. -f1,2)
                   
-                  echo "Using tag: $TAG_NAME"
                   echo "TAG=$TAG_NAME" >> $GITHUB_ENV
                   echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
 
+            - name: Normalize repository name (lowercase)
+              run: |
+                  echo "REPO_LOWER=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+
             - name: Build and push Docker image
               uses: docker/build-push-action@v2
               with:
                   context: .
+                  file: .docker/Dockerfile
                   push: true
                   tags: |
-                      ghcr.io/${{ github.repository_owner }}/$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]'):${{ env.TAG }}
-                      ghcr.io/${{ github.repository_owner }}/$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]'):${{ env.MAJOR_MINOR }}
-                  
+                      ghcr.io/${{ env.REPO_LOWER }}:${{ env.TAG }}
+                      ghcr.io/${{ env.REPO_LOWER }}:${{ env.MAJOR_MINOR }}