Merge branch 'main' of github.com:CS3219-AY2425S1/cs3219-ay2425s1-project-g16 into PEER-214

Signed-off-by: SeeuSim <[email protected]>

Author: SeeuSim

docker-compose.local.yaml

@@ -30,6 +30,7 @@ services:
       - "${QUESTION_EXPRESS_DB_PORT}:5432"
     restart: unless-stopped
 
+<<<<<<< HEAD
   collab-db:
     hostname: "collab-db"
     image: postgres:16.4
@@ -43,6 +44,8 @@ services:
       - "${COLLAB_EXPRESS_DB_PORT}:5432"
     restart: unless-stopped
 
+=======
+>>>>>>> ba41a4a2223602ec532fc1d08a3b632e0ca698cd
   match-db:
     hostname: "match-db"
     image: redis/redis-stack
@@ -55,13 +58,29 @@ services:
       - "${MATCHING_DB_HOST_MGMT_PORT}:8001"
       - "${MATCHING_DB_HOST_PORT}:6379"
     restart: unless-stopped
+<<<<<<< HEAD
+=======
+  
+  # match-db-ui:
+  #   hostname: "match-db-ui"
+  #   image: redis/redisinsight
+  #   container_name: "match-db-ui"
+  #   ports:
+  #     - "${MATCHING_DB_HOST_MGMT_PORT}:5540"
+  #   restart: unless-stopped
+>>>>>>> ba41a4a2223602ec532fc1d08a3b632e0ca698cd
 
 volumes:
   user-db-docker:
     external: true
   question-db-docker:
     external: true
+<<<<<<< HEAD
   collab-db-docker:
     external: true
   match-db-docker:
-    external: true
+    external: true
+=======
+  match-db-docker:
+    external: true
+>>>>>>> ba41a4a2223602ec532fc1d08a3b632e0ca698cd

docker-compose.yaml

@@ -162,7 +162,7 @@ services:
         restart: true
     networks:
       - collab-db-network
-      - collab-ws-network
+      - collab-api-network
     healthcheck:
       test: wget --no-verbose --tries=1 --spider http://localhost:${COLLAB_EXPRESS_PORT}/health || exit 1
       interval: 30s 
@@ -193,7 +193,7 @@ services:
       - match-db-network
       - match-api-network
       - question-api-network
-      # - collab-api-network
+      - collab-api-network
     healthcheck:
       test: wget --no-verbose --tries=1 --spider http://localhost:${MATCHING_EXPRESS_PORT}/health || exit 1
       interval: 30s 
@@ -233,7 +233,7 @@ services:
     networks:
       - user-api-network
       - question-api-network
-      - collab-ws-network
+      - collab-api-network
       - match-api-network
 
 volumes:
@@ -242,6 +242,7 @@ volumes:
     external: true
   question-db-docker:
     external: true 
+  # Collab WS Server
   collab-db-docker:
     external: true
   # Redis Match server
@@ -266,5 +267,5 @@ networks:
     driver: bridge
   match-api-network:
     driver: bridge
-  collab-ws-network:
+  collab-api-network:
     driver: bridge