fix: update CI workflow for consistency and clarity

- Changed the Dockerfile stage name from 'as' to 'AS' for consistency.
- Removed conditional checks for pull requests in the GitHub Actions workflow to ensure builds run on all events.
- Simplified the Docker build process by setting the push option to true and ensuring both AMD64 and ARM64 digests are used in the manifest creation step.

Author: atyrode

.github/workflows/docker-build.yml

@@ -12,7 +12,7 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  # Job for AMD64 architecture - runs on all events
+  # Job for AMD64 architecture
   build-amd64:
     runs-on: ubuntu-latest
     permissions:
@@ -27,7 +27,6 @@ jobs:
         id: buildx
 
       - name: Log in to the Container registry
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
@@ -51,40 +50,36 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           tags: ${{ steps.meta.outputs.tags }}-amd64
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max
           builder: ${{ steps.buildx.outputs.name }}
-          outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }}
+          outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export AMD64 digest
-        if: github.event_name != 'pull_request'
         run: |
           mkdir -p /tmp/digests
           digest="${{ steps.build.outputs.digest }}"
           touch "/tmp/digests/${digest#sha256:}"
           echo "AMD64_DIGEST=${digest}" >> $GITHUB_ENV
 
       - name: Upload AMD64 digest
-        if: github.event_name != 'pull_request'
         uses: actions/upload-artifact@v4
         with:
           name: amd64-digest
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
 
-  # Job for ARM64 architecture - only runs on main branch
+  # Job for ARM64 architecture - runs on all events
   build-arm64:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-    # Only run this job for pushes to main, not for PRs
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -107,6 +102,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=branch
+            type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=sha,format=long
@@ -144,9 +140,6 @@ jobs:
   create-manifest:
     runs-on: ubuntu-latest
     needs: [build-amd64, build-arm64]
-    # This job only runs if at least build-amd64 completed successfully
-    # build-arm64 might be skipped for PRs, so we don't require it
-    if: github.event_name != 'pull_request' && always() && needs.build-amd64.result == 'success'
     permissions:
       contents: read
       packages: write
@@ -158,8 +151,6 @@ jobs:
           path: /tmp/digests/amd64
 
       - name: Download ARM64 digest
-        # Only try to download ARM64 digest if the job ran
-        if: needs.build-arm64.result == 'success'
         uses: actions/download-artifact@v4
         with:
           name: arm64-digest
@@ -182,6 +173,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=branch
+            type=ref,event=pr
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=sha,format=long
@@ -191,22 +183,14 @@ jobs:
           # Get the first tag from meta outputs
           FIRST_TAG=$(echo "${{ steps.meta.outputs.tags }}" | cut -d, -f1)
           
-          # If ARM64 build was skipped, only use AMD64 digest
-          if [ "${{ needs.build-arm64.result }}" != "success" ]; then
-            AMD64_DIGEST=$(cat /tmp/digests/amd64/*)
-            docker buildx imagetools create \
-              --tag ${FIRST_TAG} \
-              ${AMD64_DIGEST}
-          else
-            # Otherwise use both digests
-            AMD64_DIGEST=$(cat /tmp/digests/amd64/*)
-            ARM64_DIGEST=$(cat /tmp/digests/arm64/*)
-            docker buildx imagetools create \
-              --tag ${FIRST_TAG} \
-              ${AMD64_DIGEST} ${ARM64_DIGEST}
-          fi
+          # Use both digests
+          AMD64_DIGEST=$(cat /tmp/digests/amd64/*)
+          ARM64_DIGEST=$(cat /tmp/digests/arm64/*)
+          docker buildx imagetools create \
+            --tag ${FIRST_TAG} \
+            ${AMD64_DIGEST} ${ARM64_DIGEST}
 
       - name: Inspect image
         run: |
           FIRST_TAG=$(echo "${{ steps.meta.outputs.tags }}" | cut -d, -f1)
-          docker buildx imagetools inspect ${FIRST_TAG}
+          docker buildx imagetools inspect ${FIRST_TAG}

Dockerfile

@@ -1,5 +1,5 @@
 # Frontend build stage
-FROM node:20-slim as frontend-builder
+FROM node:20-slim AS frontend-builder
 WORKDIR /app/frontend
 
 # Copy package files first to leverage layer caching
@@ -42,4 +42,4 @@ ENV PYTHONUNBUFFERED=1
 EXPOSE 8000
 
 # Run the application
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]