From b4af0917b2e29e5929ca3ce7f04eac9c505770e6 Mon Sep 17 00:00:00 2001
From: Christian Fehmer <fehmer@users.noreply.github.com>
Date: Mon, 4 Mar 2024 16:10:22 +0100
Subject: [PATCH] chore: improve docker files for local development (#5157)

---
 backend/docker/compose.db-only.yml |  4 ++--
 backend/docker/compose.yml         |  8 +++++---
 backend/package.json               |  4 ++--
 frontend/docker/compose.dev.yml    | 13 ++++++++++---
 frontend/package.json              |  2 +-
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/backend/docker/compose.db-only.yml b/backend/docker/compose.db-only.yml
index face64ea9..13321af5b 100644
--- a/backend/docker/compose.db-only.yml
+++ b/backend/docker/compose.db-only.yml
@@ -6,7 +6,7 @@ services:
     image: redis:6.2.6
     restart: on-failure
     ports:
-      - "${DOCKER_REDIS_PORT:-6379}:${DOCKER_REDIS_PORT:-6379}"
+      - "${DOCKER_REDIS_PORT:-6379}:6379"
     volumes:
       - redis-data:/data
 
@@ -15,7 +15,7 @@ services:
     image: mongo:5.0.8
     restart: on-failure
     ports:
-      - "${DOCKER_DB_PORT:-27017}:${DOCKER_DB_PORT:-27017}"
+      - "${DOCKER_DB_PORT:-27017}:27017"
     volumes:
       - mongo-data:/data/db
 
diff --git a/backend/docker/compose.yml b/backend/docker/compose.yml
index f6e2cb13b..321bcdaa7 100644
--- a/backend/docker/compose.yml
+++ b/backend/docker/compose.yml
@@ -6,7 +6,7 @@ services:
     image: redis:6.2.6
     restart: on-failure
     ports:
-      - "${DOCKER_REDIS_PORT:-6379}:${DOCKER_REDIS_PORT:-6379}"
+      - "${DOCKER_REDIS_PORT:-6379}:6379"
     volumes:
       - redis-data:/data
 
@@ -15,7 +15,7 @@ services:
     image: mongo:5.0.8
     restart: on-failure
     ports:
-      - "${DOCKER_DB_PORT:-27017}:${DOCKER_DB_PORT:-27017}"
+      - "${DOCKER_DB_PORT:-27017}:27017"
     volumes:
       - mongo-data:/data/db
 
@@ -30,11 +30,13 @@ services:
       - DB_URI=mongodb://mongodb:27017
       - REDIS_URI=redis://redis:6379
     ports:
-      - "${DOCKER_SERVER_PORT:-5005}:${DOCKER_SERVER_PORT:-5005}"
+      - "${DOCKER_SERVER_PORT:-5005}:5005"
     volumes:
+      - be-modules:/monkeytype/backend/node_modules
       - ../../:/monkeytype
     entrypoint: 'bash -c "cd /monkeytype/backend && npm install && npm run dev"'
 
 volumes:
   mongo-data:
   redis-data:
+  be-modules:
diff --git a/backend/package.json b/backend/package.json
index 79d7a61d4..9f36c0c8f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -11,8 +11,8 @@
     "test": "jest --verbose --collect-coverage --runInBand",
     "dev": "ts-node-dev ./src/server.ts -- --inspect --transpileOnly",
     "knip": "knip",
-    "docker-db-only": "docker-compose -f docker/compose.db-only.yml up",
-    "docker": "docker-compose -f docker/compose.yml up"
+    "docker-db-only": "docker compose -f docker/compose.db-only.yml up",
+    "docker": "docker compose -f docker/compose.yml up"
   },
   "engines": {
     "node": "18.19.1",
diff --git a/frontend/docker/compose.dev.yml b/frontend/docker/compose.dev.yml
index 765d42861..ee7aa4590 100644
--- a/frontend/docker/compose.dev.yml
+++ b/frontend/docker/compose.dev.yml
@@ -6,10 +6,17 @@ services:
     # restart: on-failure
     environment:
       - SERVER_OPEN=false
+      - BACKEND_URL=http://localhost:${DOCKER_SERVER_PORT:-5005}
     ports:
-      - "3000:3000"
+      - "${DOCKER_HTTP_PORT:-3000}:3000"
     volumes:
+      - root-modules:/monkeytype/node_modules
+      - fe-modules:/monkeytype/frontend/node_modules
       - ../../:/monkeytype
-    user: node
-    entrypoint: 'bash -c "cd /monkeytype/frontend && npm i && npm run dev"'
+    entrypoint: 'bash -c "cd /monkeytype && npm install && cd /monkeytype/frontend && npm install && npm run dev"'
     # entrypoint: "tail -f /dev/null"
+
+volumes:
+  root-modules:
+  fe-modules:
+
diff --git a/frontend/package.json b/frontend/package.json
index 23ff77d18..7ff6fcbf7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -19,7 +19,7 @@
     "dev-test": "concurrently --kill-others \"vite dev\" \"vitest\"",
     "tsc": "tsc",
     "knip": "knip",
-    "docker": "docker-compose -f docker/compose.dev.yml up"
+    "docker": "docker compose -f docker/compose.dev.yml up"
   },
   "engines": {
     "node": "18.19.1",