From c8967bf4b357f114116f6622f38f9ebf75de89ea Mon Sep 17 00:00:00 2001
From: Vince Grassia <593223+vgrassia@users.noreply.github.com>
Date: Mon, 7 Apr 2025 06:57:55 -0700
Subject: [PATCH] Update build web workflow (#14111)

---
 .github/workflows/build-web.yml | 37 ++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
index f706bba610..12748a4774 100644
--- a/.github/workflows/build-web.yml
+++ b/.github/workflows/build-web.yml
@@ -82,7 +82,7 @@ jobs:
 
 
   build-containers:
-    name: Build artifacts and container images
+    name: "Build [${{matrix.artifact_name}}], image tag: [${{matrix.image_name}}]"
     runs-on: ubuntu-24.04
     permissions:
       security-events: write
@@ -158,6 +158,17 @@ jobs:
           mv package.json.tmp package.json
       
       ########## Set up Docker ##########
+      - name: Set up Docker
+        uses: docker/setup-docker-action@b60f85385d03ac8acfca6d9996982511d8620a19 # v4.3.0
+        with:
+          daemon-config: |
+            {
+              "debug": true,
+              "features": {
+                "containerd-snapshotter": true
+              }
+            }
+
       - name: Set up QEMU emulators
         uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
 
@@ -175,20 +186,6 @@ jobs:
         if: ${{ needs.setup.outputs.has_secrets == 'true' }}
         run: az acr login -n ${_AZ_REGISTRY%.azurecr.io}
 
-      - name: Login to Azure - CI Subscription
-        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-
-      - name: Retrieve github PAT secrets
-        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
-        id: retrieve-secret-pat
-        uses: bitwarden/gh-actions/get-keyvault-secrets@main
-        with:
-          keyvault: "bitwarden-ci"
-          secrets: "github-pat-bitwarden-devops-bot-repo-scope"
-
       ########## Generate image tag and build Docker image ##########
       - name: Generate container image tag
         id: tag
@@ -220,7 +217,6 @@ jobs:
         run: echo "name=$_AZ_REGISTRY/${PROJECT_NAME}:${IMAGE_TAG}" >> $GITHUB_OUTPUT
 
       - name: Build Docker image
-        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
         id: build-container
         uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
         with:
@@ -229,13 +225,20 @@ jobs:
             NPM_COMMAND=${{ matrix.npm_command }}
           context: .
           file: apps/web/Dockerfile
+          load: true
           platforms: |
             linux/amd64,
             linux/arm/v7,
             linux/arm64
-          push: true
+          push: false
           tags: ${{ steps.image-name.outputs.name }}
 
+      - name: Push images
+        if: ${{ needs.setup.outputs.has_secrets == 'true' }}
+        env:
+          IMAGE_NAME: ${{ steps.image-name.outputs.name }}
+        run: docker push $IMAGE_NAME
+
       - name: Zip project
         working-directory: apps/web
         env: