PEER-254: Update env vars

Author: cyiting

docker-compose.yaml

@@ -105,18 +105,18 @@ services:
     build:
       context: ./frontend
       dockerfile: ./frontend.Dockerfile
+      target: production
       args:
-        - VITE_USER_SERVICE=http://${USER_SERVICE_NAME}:${USER_EXPRESS_PORT}
-        - VITE_QUESTION_SERVICE=http://${QUESTION_SERVICE_NAME}:${QUESTION_EXPRESS_PORT}
-        - port=${FRONTEND_PORT}
+        - FRONTEND_PORT=${FRONTEND_PORT}
     ports:
       - '3000:${FRONTEND_PORT}'
     env_file:
       - ./frontend/.env.compose
     environment:
       - VITE_USER_SERVICE=http://${USER_SERVICE_NAME}:${USER_EXPRESS_PORT}
+      ##to remove localhost once integrating question
       - VITE_QUESTION_SERVICE=http://localhost:${QUESTION_EXPRESS_PORT}
-      - port=${FRONTEND_PORT}
+      - FRONTEND_PORT=${FRONTEND_PORT}
     depends_on:
       user-service:
         condition: service_healthy

frontend/.env.docker

@@ -1,4 +1,5 @@
 FRONTEND_ENV=local
 
 VITE_USER_SERVICE=http://host.docker.internal:9001
-VITE_QUESTION_SERVICE=http://host.docker.internal:9002
+VITE_QUESTION_SERVICE=http://host.docker.internal:9002
+FRONTEND_PORT=3000

frontend/README.md

@@ -7,6 +7,7 @@
    docker build \
       --build-arg VITE_USER_SERVICE=http://host.docker.internal:9001 \
       --build-arg VITE_QUESTION_SERVICE=http://host.docker.internal:9002 \
+      --build-arg FRONTEND_PORT=3000 \
       -t frontend-app -f frontend.Dockerfile .
    ```
 2. Run this command, from the root folder:
@@ -19,7 +20,7 @@
 
 4. Run this command to expose the container:
    ```sh
-   docker run -p 3000:3000 --env-file ./.env.docker frontend-local
+   docker run -p 3000:3000 --env-file ./.env.docker frontend-app
    ```
 
 ## Running with Docker-Compose (Main config)

frontend/entrypoint.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-envsubst '${port} ${VITE_USER_SERVICE} ${VITE_QUESTION_SERVICE}' < /etc/nginx/nginx.conf.template > /etc/nginx/conf.d/default.conf
+envsubst '${FRONTEND_PORT} ${VITE_USER_SERVICE} ${VITE_QUESTION_SERVICE}' < /etc/nginx/nginx.conf.template > /etc/nginx/conf.d/default.conf
 
 nginx -g 'daemon off;'

frontend/frontend.Dockerfile

@@ -5,23 +5,17 @@ COPY ./package*.json ./
 RUN npm install
 COPY ./ ./
 
-#ADD Service ENV 
-ARG VITE_USER_SERVICE
-ARG VITE_QUESTION_SERVICE
-ENV VITE_USER_SERVICE=${VITE_USER_SERVICE}
-ENV VITE_QUESTION_SERVICE=${VITE_QUESTION_SERVICE}
-
 RUN npm run build
 
-FROM nginx:stable-alpine
+FROM nginx:stable-alpine AS production
 
 COPY --from=build /app/build /usr/share/nginx/html
 
 COPY ./nginx.conf.template /etc/nginx/nginx.conf.template
 COPY entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/entrypoint.sh
 
-ARG port
-EXPOSE ${port}
+ARG FRONTEND_PORT
+EXPOSE ${FRONTEND_PORT}
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

frontend/nginx.conf.template

@@ -1,5 +1,5 @@
 server {
-    listen ${port};
+    listen ${FRONTEND_PORT};
     location / {
         root /usr/share/nginx/html;
         index index.html;