PEER-236: Docker compose, nginx configs

Author: cyiting

backend/chat/.env.compose

@@ -1,7 +1,7 @@
 EXPRESS_PORT=9005
-EXPRESS_DB_HOST="chat-db"
+EXPRESS_DB_HOST=chat-db
 EXPRESS_DB_PORT=5435
-POSTGRES_DB="chat"
-POSTGRES_USER="peerprep-chat-express"
-POSTGRES_PASSWORD="Xk8qEcEI2sizjfEn/lF6mLqiyBECjIHY3q6sdXf9poQ="
+POSTGRES_DB=chat
+POSTGRES_USER=peerprep-chat-express
+POSTGRES_PASSWORD=Xk8qEcEI2sizjfEn/lF6mLqiyBECjIHY3q6sdXf9poQ=
 PGDATA="/data/chat-db"

backend/chat/.env.local

@@ -5,5 +5,5 @@ EXPRESS_DB_HOST=localhost
 EXPRESS_DB_PORT=5435
 POSTGRES_DB=chat
 POSTGRES_USER=peerprep-chat-express
-POSTGRES_PASSWORD='Xk8qEcEI2sizjfEn/lF6mLqiyBECjIHY3q6sdXf9poQ='
+POSTGRES_PASSWORD=Xk8qEcEI2sizjfEn/lF6mLqiyBECjIHY3q6sdXf9poQ=
 PGDATA=/data/chat-db

backend/chat/entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Drizzle will handle its own logic to remove conflicts
+npm run db:prod:migrate
+
+# Checks admin table and will not seed if data exists
+npm run db:prod:seed
+
+rm -rf drizzle src tsconfig.json
+
+npm uninstall tsx drizzle-kit
+
+npm run start

backend/chat/express.Dockerfile

@@ -1,20 +1,21 @@
 FROM node:lts-alpine AS build
-WORKDIR /data/collab-express
+WORKDIR /data/chat-express
 COPY package*.json ./
 RUN npm install
-ARG env
 COPY . .
 RUN npm run build
 
 FROM node:lts-alpine AS production
-WORKDIR /data/collab-express
-COPY --from=build /data/collab-express/package*.json ./
-COPY --from=build --chown=node:node /data/collab-express/dist ./dist
+WORKDIR /data/chat-express
+COPY --from=build /data/chat-express/package*.json ./
+COPY --from=build --chown=node:node /data/chat-express/dist ./dist
 
 RUN npm ci --omit=dev
 
-RUN sed -i 's|./ws|ws|g' ./dist/ws.js
-
+COPY src/lib/db ./src/lib/db
+COPY src/lib/utils ./src/lib/utils
+COPY src/config.ts ./src
+COPY tsconfig.json .
 COPY entrypoint.sh .
 
 ARG port

backend/chat/package.json

@@ -22,21 +22,26 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
+    "dotenv": "^16.4.5",
     "drizzle-orm": "^0.33.0",
     "express": "^4.21.0",
     "http": "^0.0.1-security",
     "http-status-codes": "^2.3.0",
     "pino": "^9.4.0",
     "pino-http": "^10.3.0",
     "postgres": "^3.4.4",
-    "socket.io": "^4.8.1"
+    "socket.io": "^4.8.1",
+    "tsc-alias": "^1.8.10",
+    "tsx": "^4.19.1"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",
     "@types/node": "^22.5.5",
     "drizzle-kit": "^0.24.2",
     "nodemon": "^3.1.4",
     "pino-pretty": "^11.2.2",
-    "ts-node": "^10.9.2"
+    "ts-node": "^10.9.2",
+    "tsx": "^4.19.1",
+    "typescript": "^5.6.3"
   }
 }

docker-compose.yaml

@@ -70,7 +70,7 @@ services:
     build:
       context: ./backend/chat/src/lib/db
     env_file:
-      - ./backend/chat/.env.local
+      - ./backend/chat/.env.compose
     volumes:
       - 'chat-db-docker:${CHAT_PGDATA}'
       #  - ./init.sql:/docker-entrypoint-initdb.d/init.sql
@@ -246,7 +246,7 @@ services:
     environment:
       # Docker Compose Specific for Service Discovery
       - EXPRESS_DB_HOST=chat-db
-      - EXPRESS_DB_PORT=5435
+      - EXPRESS_DB_PORT=5432
       - PEERPREP_UI_HOST=http://${FRONTEND_SERVICE_NAME}:${FRONTEND_PORT}
     depends_on:
       chat-db:
@@ -282,6 +282,7 @@ services:
       - VITE_COLLAB_SERVICE=http://${COLLAB_SERVICE_NAME}:${COLLAB_EXPRESS_PORT}
       - VITE_COLLAB_WS=ws://${COLLAB_SERVICE_NAME}:${COLLAB_EXPRESS_PORT}
       - VITE_MATCHING_SERVICE=http://${MATCHING_SERVICE_NAME}:${MATCHING_EXPRESS_PORT}
+      - VITE_CHAT_SERVICE=http://${CHAT_SERVICE_NAME}:${CHAT_EXPRESS_PORT}
       - FRONTEND_PORT=${FRONTEND_PORT}
     depends_on:
       user-service:
@@ -298,6 +299,7 @@ services:
       - question-api-network
       - match-api-network
       - collab-api-network
+      - chat-api-network
 
 volumes:
   # Persistent Volumes for Databases

frontend/nginx.conf.template

@@ -70,7 +70,7 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 
-     location /matching-socket/ {
+     location /chat-socket/ {
         proxy_pass ${VITE_CHAT_SERVICE};
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;