PEER-252 Validation checks passed

Author: SeeuSim

docker-compose.yaml

@@ -4,7 +4,7 @@ services:
   # Databases
   user-db:
     hostname: 'user-db'
-    image: postgres:16.4
+    image: 'postgres:16.4'
     container_name: 'user-db'
     build:
       context: ./backend/user/src/lib/db
@@ -55,8 +55,6 @@ services:
     restart: unless-stopped
     networks:
       - question-db-network
-    ports:
-      - 5433:5432
     healthcheck:
       test: ['CMD-SHELL', 'pg_isready -U peerprep-qn-express -d question']
       interval: 10s
@@ -75,8 +73,6 @@ services:
       args:
         # For building with the correct env vars
         - port=${USER_EXPRESS_PORT}
-    ports:
-      - '9001:${USER_EXPRESS_PORT}'
     env_file:
       - ./backend/user/.env.compose
     environment:
@@ -91,24 +87,22 @@ services:
       - user-db-network
       - user-api-network
     healthcheck:
-      test: wget --no-verbose --tries=1 --spider http://localhost:9001/health || exit 1
+      test: wget --no-verbose --tries=1 --spider http://localhost:${USER_EXPRESS_PORT}/health || exit 1
       interval: 30s
       timeout: 10s
       retries: 5
       start_period: 5s
 
   question-service:
     image: "question-express"
-    container_name: "question-express"
+    container_name: '${QUESTION_SERVICE_NAME}'
     build:
       context: ./backend/question
       dockerfile: express.Dockerfile
       target: production
       args: 
         # For building with the correct env vars
         - port=${QUESTION_EXPRESS_PORT}
-    ports:
-      - "9002:${QUESTION_EXPRESS_PORT}"
     env_file:
       - ./backend/question/.env.compose
     environment:
@@ -123,7 +117,7 @@ services:
       - question-db-network
       - question-api-network
     healthcheck:
-      test: wget --no-verbose --tries=1 --spider http://localhost:9002/health || exit 1
+      test: wget --no-verbose --tries=1 --spider http://localhost:${QUESTION_EXPRESS_PORT}/health || exit 1
       interval: 30s 
       timeout: 10s   
       retries: 5       
@@ -145,13 +139,15 @@ services:
       - ./frontend/.env.compose
     environment:
       - VITE_USER_SERVICE=http://${USER_SERVICE_NAME}:${USER_EXPRESS_PORT}
-      ##to remove localhost once integrating question
-      - VITE_QUESTION_SERVICE=http://host.docker.internal:${QUESTION_EXPRESS_PORT}
+      - VITE_QUESTION_SERVICE=http://${QUESTION_SERVICE_NAME}:${QUESTION_EXPRESS_PORT}
       - FRONTEND_PORT=${FRONTEND_PORT}
     depends_on:
       user-service:
         condition: service_healthy
         restart: true
+      question-service:
+        condition: service_healthy
+        restart: true
     networks:
       - user-api-network
       - question-api-network