From 5bad362793defb40d8f05be7bc04bf419ae8a591 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 8 Sep 2025 20:27:20 -0700 Subject: [PATCH 1/2] fix server build order --- docker/dist-mono/docker-compose.yaml | 1 + docker/dist-mono/server.Dockerfile | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docker/dist-mono/docker-compose.yaml b/docker/dist-mono/docker-compose.yaml index 0e0b49445..9553757b9 100755 --- a/docker/dist-mono/docker-compose.yaml +++ b/docker/dist-mono/docker-compose.yaml @@ -1,6 +1,7 @@ services: server: image: ghcr.io/bluewave-labs/checkmate-backend-mono:latest + pull_policy: always restart: always ports: - "52345:52345" diff --git a/docker/dist-mono/server.Dockerfile b/docker/dist-mono/server.Dockerfile index 7304d9995..405f9e6ac 100644 --- a/docker/dist-mono/server.Dockerfile +++ b/docker/dist-mono/server.Dockerfile @@ -1,10 +1,5 @@ FROM node:20-slim AS frontend-build -# Install ping -RUN apt-get update \ - && apt-get install -y iputils-ping \ - && rm -rf /var/lib/apt/lists/* - WORKDIR /app/client COPY client/package*.json ./ @@ -15,6 +10,11 @@ RUN npm run build FROM node:20-slim AS app +# Install ping +RUN apt-get update \ + && apt-get install -y iputils-ping \ + && rm -rf /var/lib/apt/lists/* + WORKDIR /app/server COPY server ./ From a015cc67060501751cac851c280d632b56d16e03 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 8 Sep 2025 20:29:38 -0700 Subject: [PATCH 2/2] fix dist-arm, bump version --- client/vite.config.js | 4 ++-- docker/dist-arm/server.Dockerfile | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/client/vite.config.js b/client/vite.config.js index a90b67462..a6b7152f1 100644 --- a/client/vite.config.js +++ b/client/vite.config.js @@ -5,12 +5,12 @@ import { execSync } from "child_process"; export default defineConfig(({ mode }) => { const env = loadEnv(mode, process.cwd(), ""); - let version = "3.1.7"; + let version = "3.1.8"; return { base: "/", plugins: [svgr(), react()], - optimizeDeps: { + optimizeDeps: { Maybe this will be the straw th include: ["@mui/material/Tooltip", "@emotion/styled"], }, define: { diff --git a/docker/dist-arm/server.Dockerfile b/docker/dist-arm/server.Dockerfile index 3a4aa755d..e47db9a74 100644 --- a/docker/dist-arm/server.Dockerfile +++ b/docker/dist-arm/server.Dockerfile @@ -3,10 +3,7 @@ # --------------------- FROM node:24-slim AS frontend-build -# Install ping -RUN apt-get update \ - && apt-get install -y iputils-ping \ - && rm -rf /var/lib/apt/lists/* + WORKDIR /app/client @@ -25,6 +22,11 @@ RUN npm run build # --------------------- FROM node:24-slim AS backend +# Install ping +RUN apt-get update \ + && apt-get install -y iputils-ping \ + && rm -rf /var/lib/apt/lists/* + WORKDIR /app/server COPY server/package.json ./