From b78389f113978bac06e3ac9d7e57a8ceaaff29c7 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 22 May 2025 10:02:49 -0700 Subject: [PATCH 1/2] use init sidecar --- docker/dist-arm/docker-compose.yaml | 25 +++++++++++++++++-- .../dist-arm/mongo/init/init-replica-set.js | 4 --- 2 files changed, 23 insertions(+), 6 deletions(-) delete mode 100644 docker/dist-arm/mongo/init/init-replica-set.js diff --git a/docker/dist-arm/docker-compose.yaml b/docker/dist-arm/docker-compose.yaml index ee8e1e44d..274853278 100644 --- a/docker/dist-arm/docker-compose.yaml +++ b/docker/dist-arm/docker-compose.yaml @@ -26,8 +26,29 @@ services: restart: unless-stopped mongodb: image: mongo:4.4.18 + container_name: checkmate-mongodb restart: always - command: ["mongod", "--quiet", "--replSet", "rs0", "--bind_ip_all"] + command: ["mongod", "--replSet", "rs0", "--bind_ip_all"] + ports: + - "27017:27017" volumes: - ./mongo/data:/data/db - - ./mongo/init:/docker-entrypoint-initdb.d + + mongo-init: + image: mongo:4.4.18 + depends_on: + - mongodb + entrypoint: > + bash -c " + echo 'Waiting for MongoDB to be ready...' && + until mongo --host mongodb --eval 'db.adminCommand(\"ping\")' > /dev/null 2>&1; do + sleep 2 + done && + echo 'MongoDB is up. Initiating replica set...' && + mongo --host mongodb --eval ' + rs.initiate({ + _id: \"rs0\", + members: [{ _id: 0, host: \"mongodb:27017\" }] + }) + ' || echo 'Replica set may already be initialized.' + " diff --git a/docker/dist-arm/mongo/init/init-replica-set.js b/docker/dist-arm/mongo/init/init-replica-set.js deleted file mode 100644 index 5e3d50b76..000000000 --- a/docker/dist-arm/mongo/init/init-replica-set.js +++ /dev/null @@ -1,4 +0,0 @@ -rs.initiate({ - _id: "rs0", - members: [{ _id: 0, host: "mongodb:27017" }], -}); From 47705f85efd457b42ba4ca0c0db668c7103da5a6 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 22 May 2025 10:37:26 -0700 Subject: [PATCH 2/2] update gitignore, update vite config --- client/vite.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/vite.config.js b/client/vite.config.js index 22fcd51fa..dc84ce055 100644 --- a/client/vite.config.js +++ b/client/vite.config.js @@ -4,6 +4,7 @@ import svgr from "vite-plugin-svgr"; // https://vitejs.dev/config/ export default defineConfig({ + base: "/", plugins: [svgr(), react()], optimizeDeps: { include: ["@mui/material/Tooltip", "@emotion/styled"],