From a86d5c936b5b4f2cec706bc391a61e310862088a Mon Sep 17 00:00:00 2001
From: Alessio Dal Santo <alessio.dalsanto@vargroup.com>
Date: Fri, 16 Jan 2026 14:25:56 +0100
Subject: [PATCH] fix: Correct YAML syntax errors in docker-build workflow

---
 .github/workflows/docker-build.yml | 36 +++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 542537c..3f48edc 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -112,6 +112,7 @@ jobs:
             # Tag with commit sha
             type=sha,prefix={{branch}}-windows-,format=short
             # Tag with date
+            type=raw,value={{branch}}-windows-{{date 'YYYYMMDD-HHmmss'}}
           flavor: |
             latest=false
 
@@ -137,8 +138,7 @@ jobs:
           }
           
           # Remove temporary tag
-          docker rmi "${imageName}:temp-windows" }
-          }
+          docker rmi "${imageName}:temp-windows"
         shell: pwsh
 
   create-manifest:
@@ -146,7 +146,21 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build-linux, build-windows]
     permissions:
-      contIMAGE_LOWER=$(echo "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]')
+      contents: read
+      packages: write
+      
+    steps:
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create and push manifest for main branch
+        if: github.ref == 'refs/heads/main'
+        run: |
+          IMAGE_LOWER=$(echo "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]')
           docker buildx imagetools create -t ${IMAGE_LOWER}:latest \
             ${IMAGE_LOWER}:latest \
             ${IMAGE_LOWER}:latest-windows
@@ -165,18 +179,4 @@ jobs:
           IMAGE_LOWER=$(echo "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]')
           docker buildx imagetools create -t ${IMAGE_LOWER}:staging-latest \
             ${IMAGE_LOWER}:staging-latest \
-            ${IMAGE_LOWER}:latest-windows
-
-      - name: Create and push manifest for dev branch
-        if: github.ref == 'refs/heads/dev'
-        run: |
-          docker buildx imagetools create -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev-latest \
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev-latest \
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev-latest-windows
-
-      - name: Create and push manifest for staging branch
-        if: github.ref == 'refs/heads/staging'
-        run: |
-          docker buildx imagetools create -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:staging-latest \
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:staging-latest \
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:staging-latest-windows
+            ${IMAGE_LOWER}:staging-latest-windows