Merge pull request #2 from famasboy888/dev

PR to main

README.md

@@ -87,3 +87,31 @@ jobs:
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME  }}/react-app:0.0.${{ github.run_number }}.RELEASE
 ```
+
+## Added working nginx.conf
+
+```bash
+upstream backend {
+        server node-server-service;
+}
+
+
+server {
+    listen 8080;
+    location / {
+        root /usr/share/nginx/html;
+        index index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /api/ {
+        proxy_pass http://backend;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+}
+```

backend/.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+build

backend/Dockerfile

@@ -2,9 +2,9 @@ FROM node:17-alpine
 
 WORKDIR /app
 
-COPY package.json .
+COPY package*.json ./
 
-RUN npm install
+RUN npm ci
 
 COPY . .
 

frontend/.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+build

frontend/Dockerfile

@@ -1,13 +1,22 @@
-FROM node:20.12.0-alpine
+FROM node:alpine as build
 
 WORKDIR /app
 
-COPY package.json .
+COPY package*.json ./
 
-RUN npm install
+RUN npm ci
 
 COPY . .
 
-EXPOSE 8080
+RUN npm run build
 
-CMD [ "npm", "start" ]
+
+FROM nginx:alpine
+
+COPY --from=build /app/build /usr/share/nginx/html
+
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

frontend/nginx.conf

@@ -0,0 +1,23 @@
+upstream backend {
+        server node-server-service;
+}
+
+
+server {
+    listen 8080;
+    location / {
+        root /usr/share/nginx/html;
+        index index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /api/ {
+        proxy_pass http://backend;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+}

frontend/package.json

@@ -1,5 +1,4 @@
 {
-  "proxy": "http://frontend:80",
   "name": "frontend",
   "version": "0.1.0",
   "private": true,