refactor: update Dockerfiles and nginx configurations for consistency and optimization

FrontendV2/Dockerfile

@@ -3,8 +3,7 @@ FROM node:18 as builder
 WORKDIR /app
 
 COPY package.json package-lock.json ./
-
+RUN npm ci
-RUN npm install --frozen-lockfile
 
 COPY . .
 RUN npm run build
@@ -12,8 +11,9 @@ RUN npm run build
 FROM nginx:alpine AS runner
 
 WORKDIR /usr/share/nginx/html
-
 COPY --from=builder /app/dist .
 
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

FrontendV2/nginx.conf

@@ -0,0 +1,18 @@
+server {
+  listen 80;
+  server_name _;
+
+  root /usr/share/nginx/html;
+  index index.html;
+
+  location / {
+    try_files $uri $uri/ /index.html;
+  }
+
+  location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
+    expires 1y;
+    access_log off;
+    add_header Cache-Control "public, immutable";
+    try_files $uri =404;
+  }
+}

admin/Dockerfile

@@ -1,12 +1,19 @@
-FROM node:20-alpine
+FROM node:18 as builder
 
 WORKDIR /app
 
-COPY package*.json ./
+COPY package.json package-lock.json ./
-RUN npm install
+RUN npm ci
 
 COPY . .
+RUN npm run build
 
-EXPOSE 8003
+FROM nginx:alpine AS runner
 
-CMD ["npm", "run", "dev"]
+WORKDIR /usr/share/nginx/html
+COPY --from=builder /app/dist .
+
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]

admin/nginx.conf

@@ -0,0 +1,18 @@
+server {
+  listen 80;
+  server_name _;
+
+  root /usr/share/nginx/html;
+  index index.html;
+
+  location / {
+    try_files $uri $uri/ /index.html;
+  }
+
+  location ~* \.(?:js|mjs|css|png|jpg|jpeg|gif|ico|svg|woff2?)$ {
+    expires 1y;
+    access_log off;
+    add_header Cache-Control "public, immutable";
+    try_files $uri =404;
+  }
+}

admin/tsconfig.app.json

@@ -30,7 +30,7 @@
     },
 
     "forceConsistentCasingInFileNames": true,
-    "ignoreDeprecations": "6.0"
+    "ignoreDeprecations": "5.0"
   },
   "include": ["src"]
 }

docker-compose.yml

@@ -1,5 +1,5 @@
 services:
-  #  usr-frontendV2:
+  #  usr-frontend_v2:
   #    container_name: borrow_system-usr-frontend
   #    build: ./FrontendV2
   #    ports:
@@ -10,12 +10,7 @@ services:
   #    container_name: borrow_system-admin-frontend
   #    build: ./admin
   #    ports:
-  #      - "8003:8003"
+  #      - "8003:80"
-  #    environment:
-  #      - CHOKIDAR_USEPOLLING=true
-  #    volumes:
-  #      - ./admin:/app
-  #      - /app/node_modules
   #    restart: unless-stopped
 
   backend: