Merge dev into main

Merge dev into main for customer deploy.

.gitea/workflows/deploy-customer-main.yml

@@ -78,12 +78,15 @@ jobs:
             exit 1
           fi
 
-      - name: Install crane
+      - name: Setup Docker Buildx
         run: |
           set -euo pipefail
-          curl -fsSL https://github.com/google/go-containerregistry/releases/download/v0.19.0/go-containerregistry_Linux_x86_64.tar.gz \
-            | tar xz crane
-          chmod +x crane
+          if ! docker buildx inspect customer-builder >/dev/null 2>&1; then
+            docker buildx create --name customer-builder --driver docker-container --use
+          else
+            docker buildx use customer-builder
+          fi
+          docker buildx inspect --bootstrap
 
       - name: Build and push customer images
         env:
@@ -103,31 +106,29 @@ jobs:
           celery_ref="${registry_path}/${CUSTOMER_CELERY_IMAGE}"
 
           printf '%s' "${registry_password}" \
-            | ./crane auth login "${CUSTOMER_REGISTRY_HOST}" \
+            | docker login "${CUSTOMER_REGISTRY_HOST}" \
               -u "${registry_user}" \
               --password-stdin
 
-          docker build \
+          docker buildx build \
             --platform linux/amd64 \
             -f ./docker/Dockerfile \
             --target runtime-web \
             --build-arg INSTALL_DEV=false \
-            -t customer-state-corp-backend-web:local \
+            --push \
+            -t "${web_ref}:latest" \
+            -t "${web_ref}:${sha_short}" \
             .
-          docker save customer-state-corp-backend-web:local -o /tmp/customer-state-corp-backend-web.tar
-          ./crane push /tmp/customer-state-corp-backend-web.tar "${web_ref}:latest"
-          ./crane push /tmp/customer-state-corp-backend-web.tar "${web_ref}:${sha_short}"
 
-          docker build \
+          docker buildx build \
             --platform linux/amd64 \
             -f ./docker/Dockerfile \
             --target runtime-celery \
             --build-arg INSTALL_DEV=false \
-            -t customer-state-corp-backend-celery:local \
+            --push \
+            -t "${celery_ref}:latest" \
+            -t "${celery_ref}:${sha_short}" \
             .
-          docker save customer-state-corp-backend-celery:local -o /tmp/customer-state-corp-backend-celery.tar
-          ./crane push /tmp/customer-state-corp-backend-celery.tar "${celery_ref}:latest"
-          ./crane push /tmp/customer-state-corp-backend-celery.tar "${celery_ref}:${sha_short}"
 
       - name: Deploy customer stack
         env: