client/Dockerfile

@@ -12,10 +12,9 @@ RUN npm install
 
 RUN npm run build
 
-ENV PORT=5173
+EXPOSE 5173
-EXPOSE ${PORT}
 
 HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=3 \
-    CMD curl -f http://localhost:${PORT} || exit 1
+    CMD curl -f http://localhost:5173 || exit 1
 
 CMD [ "npm", "run", "preview" ]

docker-compose.local.yaml

@@ -3,29 +3,21 @@ version: '3'
 services: 
 
   frontend:
-    container_name: frontend
     build:
       context: ./client
       dockerfile: Dockerfile
+    container_name: frontend
     ports:
       - "5173:5173"
     networks:
       - quiz_network
     restart: always
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:$${PORT} || exit 1"]
-      interval: 5s
-      timeout: 10s
-      start_period: 5s
-      retries: 6
     
   backend:
     build:
       context: ./server
       dockerfile: Dockerfile
     container_name: backend
-    networks:
-      - quiz_network
     ports:
       - "3000:3000"
     volumes:
@@ -38,15 +30,14 @@ services:
       SENDER_EMAIL: infoevaluetonsavoir@gmail.com
       EMAIL_PSW: 'vvml wmfr dkzb vjzb'
       JWT_SECRET: haQdgd2jp09qb897GeBZyJetC8ECSpbFJe
+      FRONTEND_URL: "http://localhost:5173"
+      #QUIZROOM_IMAGE: ghcr.io/ets-cfuhrman-pfe/evaluetonsavoir-quizroom:latest
     depends_on:
       mongo:
         condition: service_healthy
-    healthcheck:
+    networks:
-      test: ["CMD-SHELL", "curl -f http://localhost:$${PORT}/health || exit 1"]
+      - quiz_network
-      interval: 5s
+    restart: always
-      timeout: 10s
-      start_period: 5s
-      retries: 6
 
   quizroom: # Forces image to update
     build:
@@ -58,12 +49,6 @@ services:
     networks:
       - quiz_network
     restart: always
-    healthcheck:
-      test: ["CMD", "/usr/src/app/healthcheck.sh"]
-      interval: 5s
-      timeout: 10s
-      start_period: 5s
-      retries: 6
 
   nginx:
     build:
@@ -87,7 +72,7 @@ services:
     #  - BACKEND_HOST=backend
     #  - BACKEND_PORT=3000
     healthcheck:
-      test: ["CMD-SHELL", "wget --spider http://0.0.0.0:$${PORT}/health || exit 1"]
+      test: ["CMD-SHELL", "wget --spider http://0.0.0.0:${PORT}/health || exit 1"]
       interval: 5s
       timeout: 10s
       start_period: 5s

nginx/Dockerfile

@@ -61,7 +61,6 @@ RUN echo 'load_module modules/ngx_http_js_module.so;' > /tmp/nginx.conf && \
 COPY templates/default.conf /etc/nginx/templates/
 COPY njs/main.js /etc/nginx/njs/
 COPY entrypoint.sh /entrypoint.sh
-RUN dos2unix /entrypoint.sh
 
 ENV PORT=80 \
     FRONTEND_HOST=frontend \
@@ -86,5 +85,4 @@ HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
     CMD wget -q --spider http://0.0.0.0:${PORT}/health || exit 1
 
 # Start Nginx using entrypoint script
-# CMD [ "/bin/sh","-c","sleep 3600" ] # For debugging
+ENTRYPOINT ["/entrypoint.sh"]
-ENTRYPOINT [ "/entrypoint.sh" ]

server/Dockerfile

@@ -8,8 +8,7 @@ RUN npm install
 
 COPY ./ .
 
-ENV PORT=3000
+EXPOSE 4400
-EXPOSE ${PORT}
 
 HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
     CMD curl -f http://localhost:${PORT}/health || exit 1