PEER-254: Inject env vars into nginx config

Author: cyiting

.env.local

@@ -10,12 +10,15 @@ COLLAB_EXPRESS_DB_PORT=5434
 MATCHING_PGDATA="/data/collab-db"
 MATCHING_EXPRESS_DB_PORT=5434
 
+USER_SERVICE_NAME=user-express
 USER_EXPRESS_ENV=compose
 USER_EXPRESS_PORT=9001
 
+QUESTION_SERVICE_NAME=question-service
 QUESTION_EXPRESS_ENV=compose
 QUESTION_EXPRESS_PORT=9002
 
+COLLAB_SERVICE_NAME=collab-service
 COLLAB_EXPRESS_ENV=compose
 COLLAB_EXPRESS_PORT=9003
 

docker-compose.yaml

@@ -78,19 +78,22 @@ services:
   # Frontend
 
   frontend:
-    image: 'frontend'
     container_name: 'frontend'
     build:
       context: ./frontend
       dockerfile: ./frontend.Dockerfile
       args:
-        - VITE_USER_SERVICE
-        - VITE_QUESTION_SERVICE
+        - VITE_USER_SERVICE=http://${USER_SERVICE_NAME}:${USER_EXPRESS_PORT}
+        - VITE_QUESTION_SERVICE=http://${QUESTION_SERVICE_NAME}:${QUESTION_EXPRESS_PORT}
         - port=${FRONTEND_PORT}
     ports:
       - '3000:${FRONTEND_PORT}'
     env_file:
       - ./frontend/.env.compose
+    environment:
+      - VITE_USER_SERVICE=http://${USER_SERVICE_NAME}:${USER_EXPRESS_PORT}
+      - VITE_QUESTION_SERVICE=http://localhost:${QUESTION_EXPRESS_PORT}
+      - port=${FRONTEND_PORT}
     # depends_on:
     #   - user-service
     networks:

frontend/.env.compose

@@ -1,6 +1,6 @@
 FRONTEND_ENV=compose
 
-VITE_USER_SERVICE=http://user-service:9001
-VITE_QUESTION_SERVICE=http://question-service:9002
+# VITE_USER_SERVICE=http://user-service:9001
+# VITE_QUESTION_SERVICE=http://question-service:9002
 
-FRONTEND_PORT=3000
+# FRONTEND_PORT=3000

frontend/entrypoint.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+envsubst '${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

@@ -14,8 +14,14 @@ ENV VITE_QUESTION_SERVICE=${VITE_QUESTION_SERVICE}
 RUN npm run build
 
 FROM nginx:stable-alpine
+
 COPY --from=build /app/build /usr/share/nginx/html
-COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 
-EXPOSE 3000
-CMD ["nginx", "-g", "daemon off;"]
+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}
+
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

frontend/nginx.conf renamed to frontend/nginx.conf.template

@@ -1,28 +1,27 @@
 server {
-    listen 3000;
+    listen ${port};
     location / {
         root /usr/share/nginx/html;
         index index.html;
         try_files $uri $uri/ /index.html;
     }
 
     location /user-service/ {
-        proxy_pass http://host.docker.internal:9001/;
+        proxy_pass ${VITE_USER_SERVICE};
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 
     location /question-service/ {
-        proxy_pass http://host.docker.internal:9002/;
+        proxy_pass ${VITE_QUESTION_SERVICE};
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 
-    # Optionally log details of proxied requests
     access_log /var/log/nginx/access.log;
     error_log /var/log/nginx/error.log;
 }