From fb0a86d37cb79e69e759594fc15da1583b6baf9d Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 4 Sep 2025 13:39:53 -0700
Subject: [PATCH 1/2] update docker compoes and docker file

---
 docker/dist-arm/docker-compose.yaml | 3 ++-
 docker/dist-arm/server.Dockerfile   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/dist-arm/docker-compose.yaml b/docker/dist-arm/docker-compose.yaml
index 842d4678a..0a5825b3e 100644
--- a/docker/dist-arm/docker-compose.yaml
+++ b/docker/dist-arm/docker-compose.yaml
@@ -2,6 +2,7 @@ services:
   server:
     image: ghcr.io/bluewave-labs/checkmate-backend-mono-multiarch:latest
     restart: always
+    pull_policy: always
     ports:
       - "52345:52345"
     environment:
@@ -16,7 +17,7 @@ services:
   mongodb:
     image: mongo:4.4.18
     restart: always
-    command: ["mongod", "--quiet", --bind_ip_all"]
+    command: ["mongod", "--quiet", "--bind_ip_all"]
     ports:
       - "27017:27017"
     volumes:
diff --git a/docker/dist-arm/server.Dockerfile b/docker/dist-arm/server.Dockerfile
index 1e32cd152..d399b9c20 100644
--- a/docker/dist-arm/server.Dockerfile
+++ b/docker/dist-arm/server.Dockerfile
@@ -1,7 +1,7 @@
 # ---------------------
 # Frontend build stage
 # ---------------------
-FROM --platform=$BUILDPLATFORM node:24-slim AS frontend-build
+FROM --platform=$TARGETPLATFORM node:24-slim AS frontend-build
 
 WORKDIR /app/client
 
@@ -18,7 +18,7 @@ RUN npm run build
 # ---------------------
 # Backend stage
 # ---------------------
-FROM --platform=$BUILDPLATFORM node:24-slim AS backend
+FROM --platform=$TARGETPLATFORM node:24-slim AS backend
 
 WORKDIR /app/server
 

From 72f070fbcbc70c9da4c5ec6d7bffd2036b4177be Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 4 Sep 2025 15:15:09 -0700
Subject: [PATCH 2/2] fix multiarch build

---
 docker/dist-arm/server.Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/dist-arm/server.Dockerfile b/docker/dist-arm/server.Dockerfile
index d399b9c20..3aee87abd 100644
--- a/docker/dist-arm/server.Dockerfile
+++ b/docker/dist-arm/server.Dockerfile
@@ -1,30 +1,30 @@
 # ---------------------
 # Frontend build stage
 # ---------------------
-FROM --platform=$TARGETPLATFORM node:24-slim AS frontend-build
+FROM node:24-slim AS frontend-build
 
 WORKDIR /app/client
 
-COPY client/package*.json ./
+COPY client/package.json ./
 
-RUN npm ci
+RUN npm install
+
+RUN npm install esbuild@0.25.5 --build-from-source
 
 COPY client ./
 
-RUN npm rebuild esbuild
-
 RUN npm run build
 
 # ---------------------
 # Backend stage
 # ---------------------
-FROM --platform=$TARGETPLATFORM node:24-slim AS backend
+FROM node:24-slim AS backend
 
 WORKDIR /app/server
 
-COPY server/package*.json ./
+COPY server/package.json ./
 
-RUN npm ci
+RUN npm install
 
 COPY server ./