add docker config

Author: TabrizPlv

backend/collaboration/package.json

@@ -21,7 +21,6 @@
     "env-cmd": "^10.1.0",
     "express": "^4.21.1",
     "http-status-codes": "^2.3.0",
-    "pg": "^8.13.0",
     "pino": "^9.4.0",
     "pino-http": "^10.3.0",
     "redis": "^4.7.0",

backend/collaboration/src/config.ts

@@ -3,5 +3,3 @@ import 'dotenv/config';
 export const UI_HOST = process.env.PEERPREP_UI_HOST!;
 
 export const EXPRESS_PORT = process.env.EXPRESS_PORT;
-
-export const WEBSOCKET_PORT = process.env.WEBSOCKET_PORT;

backend/collaboration/src/index.ts

@@ -4,11 +4,9 @@ import { dbHealthCheck } from '@/server';
 import server from '@/websocket';
 
 const port = Number.parseInt(EXPRESS_PORT || '8001');
-const wsPort = Number.parseInt(WEBSOCKET_PORT || '8002');
 
 const listenMessage = `App listening on port: ${port}`;
 server.listen(port, () => {
   void dbHealthCheck();
   logger.info(listenMessage);
 });
-server.listen(wsPort, () => logger.info(`WebSocket listening on port: ${wsPort}`));

backend/collaboration/src/y-postgresql/interfaces.ts

@@ -76,6 +76,24 @@ services:
     networks:
       - match-db-network
 
+  collab-db:
+    hostname: 'collab-db'
+    image: postgres:16.4
+    container_name: 'collab-db'
+    env_file:
+      - ./backend/collaboration/.env.local
+    volumes:
+      - 'collab-db-docker:${COLLAB_PGDATA}'
+    restart: unless-stopped
+    networks:
+      - collab-db-network
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U peerprep-collab-express -d collab']
+      interval: 10s
+      retries: 5
+      start_period: 30s
+      timeout: 10s
+
   # Services
   user-service:
     image: 'user-express'
@@ -201,6 +219,37 @@ services:
       retries: 5       
       start_period: 5s
 
+  collab-service:
+    image: 'collab-express'
+    container_name: '${COLLAB_SERVICE_NAME}'
+    build:
+      context: ./backend/collaboration
+      dockerfile: express.Dockerfile
+      target: production
+      args: 
+        # For building with the correct env vars
+        - port=${COLLAB_EXPRESS_PORT}
+    env_file:
+      - ./backend/collaboration/.env.compose
+    environment:
+      # Docker Compose Specific for Service Discovery
+      - EXPRESS_DB_HOST=collab-db
+      - EXPRESS_DB_PORT=5432
+      - PEERPREP_UI_HOST=http://${FRONTEND_SERVICE_NAME}:${FRONTEND_PORT}
+    depends_on:
+      collab-db:
+        condition: service_healthy
+        restart: true
+    networks:
+      - collab-db-network
+      - collab-ws-network
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider http://localhost:${COLLAB_EXPRESS_PORT}/health || exit 1
+      interval: 30s 
+      timeout: 10s   
+      retries: 5       
+      start_period: 5s
+
   # Frontend
   frontend:
     image: 'frontend'
@@ -247,6 +296,8 @@ volumes:
   # Redis Match server
   match-db-docker:
     external: true
+  collab-db-docker:
+    external: true
 
 networks:
   # Isolated API Server Networks