From 4cad91db95ed425603dd1629464a803a8c6df47e Mon Sep 17 00:00:00 2001
From: Kasra Bigdeli <kasra85@gmail.com>
Date: Fri, 28 Aug 2026 22:16:46 -0700
Subject: [PATCH 1/2] Fix edge multi-architecture build setup

---
 .github/workflows/build_push_docker_edge.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_push_docker_edge.yml b/.github/workflows/build_push_docker_edge.yml
index 082b025..3119662 100644
--- a/.github/workflows/build_push_docker_edge.yml
+++ b/.github/workflows/build_push_docker_edge.yml
@@ -5,12 +5,16 @@ on:
         branches:
             - master
 
+concurrency:
+    group: build-edge
+    cancel-in-progress: true
+
 jobs:
     run-pre-checks:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v4
+            - uses: actions/setup-node@v4
               with:
                   node-version: 20
             - run: |
@@ -21,12 +25,15 @@ jobs:
     build-publish-docker-hub:
         needs: run-pre-checks
         runs-on: ubuntu-latest
+        timeout-minutes: 20
         steps:
-            - uses: azure/docker-login@v1
+            - uses: docker/login-action@v3
               with:
                   username: ${{ secrets.REGISTRY_USERNAME }}
                   password: ${{ secrets.REGISTRY_PASSWORD }}
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
+            - uses: docker/setup-qemu-action@v3
+            - uses: docker/setup-buildx-action@v3
             - name: Build and Push Edge to DockerHub
               shell: bash
               run: ./.github/scripts/build_and_push_edge.sh

From c6aaa761c505834a89dbd2d3894ab55f066d96d2 Mon Sep 17 00:00:00 2001
From: Kasra Bigdeli <kasra85@gmail.com>
Date: Fri, 28 Aug 2026 22:17:01 -0700
Subject: [PATCH 2/2] Drop ARMv7 from edge image build

---
 .github/scripts/build_and_push_edge.sh | 28 +++++++++-----------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/scripts/build_and_push_edge.sh b/.github/scripts/build_and_push_edge.sh
index 1bb0cae..0bdc317 100755
--- a/.github/scripts/build_and_push_edge.sh
+++ b/.github/scripts/build_and_push_edge.sh
@@ -4,7 +4,7 @@
 set -e
 
 # Print all commands
-set -x 
+set -x
 
 pwd
 
@@ -16,34 +16,26 @@ else
     echo "Running on CI"
 fi
 
-
 CAPROVER_VERSION=edge
 IMAGE_NAME=caprover/cli-caprover
 
 if [ ! -f ./package-lock.json ]; then
     echo "package-lock.json not found!"
-    exit 1;
+    exit 1
 fi
 
-
 # BRANCH=$(git rev-parse --abbrev-ref HEAD)
 # On Github the line above does not work, instead:
 BRANCH=${GITHUB_REF##*/}
 echo "on branch $BRANCH"
 if [[ "$BRANCH" != "master" ]]; then
-    echo 'Not on master branch! Aborting script!';
-    exit 1;
+    echo 'Not on master branch! Aborting script!'
+    exit 1
 fi
 
-
-
-
-
-docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-export DOCKER_CLI_EXPERIMENTAL=enabled
-docker buildx ls
-docker buildx create --name mybuilder
-docker buildx use mybuilder
-
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm -t $IMAGE_NAME:$CAPROVER_VERSION -f Dockerfile --push .
-
+docker buildx build \
+    --platform linux/amd64,linux/arm64 \
+    -t "$IMAGE_NAME:$CAPROVER_VERSION" \
+    -f Dockerfile \
+    --push \
+    .