add web

Author: Alan

docker-compose.yaml

@@ -20,12 +20,4 @@ services:
       - 80:80
     depends_on:
       - docker-fastapi
-  web:
-    container_name: "web"
-    build:
-      context: .
-      dockerfile: ./docker/frontend/Dockerfile
-    ports:
-      - 3000:3000
-
 

docker/frontend/Dockerfile

@@ -1,21 +1,21 @@
 
-#FROM node:latest as build_frontend
-#
-#
-#WORKDIR /app
-#
-##COPY ./frontend/package.json ./frontend/package-lock.json /usr/src/app/
-#
-#COPY ./frontend .
-#RUN npm install
-#
-#RUN npm run build
+FROM node:latest as build_frontend
+
+
+WORKDIR /app
+
+#COPY ./frontend/package.json ./frontend/package-lock.json /usr/src/app/
+
+COPY ./frontend .
+RUN npm install
+
+RUN npm run build
 
 
 FROM nginx:latest
-#RUN rm /usr/share/nginx/html/*
-#COPY --from=build_frontend /app/build /usr/share/nginx/html
-#RUN rm /etc/nginx/conf.d/default.conf
+RUN rm /usr/share/nginx/html/*
+COPY --from=build_frontend /app/build /usr/share/nginx/html
+RUN rm /etc/nginx/conf.d/default.conf
 
 COPY ./docker/nginx/nginx.conf /etc/nginx/conf.d
 EXPOSE 80

docker/nginx/Dockerfile

@@ -1,24 +1,27 @@
 upstream docker_fastapi {
     server docker-fastapi:8080;
 }
-upstream web {
-    server web:3000;
-}
-
-
 
 server {
     listen 80;
-    server_name  nginx;
-    proxy_set_header Host $host;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Real-IP  $remote_addr;
+
+    location ~ /api/ {
+        proxy_pass http://docker_fastapi;
+        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-Host $server_name;
+    }
 
     location / {
-    proxy_pass http://web/;
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri $uri/ /index.html;
     }
 
-    location /api/v1 {
-    proxy_pass http://fastapi_backend/api/v1;
+    error_page   500 502 503 504  /50x.html;
+
+    location = /50x.html {
+        root   /usr/share/nginx/html;
     }
 }