From 022dcbcbddfd2f905b3b7ab62d08b1610b908f80 Mon Sep 17 00:00:00 2001
From: MoonTestUse1 <crocoman7887@gmail.com>
Date: Tue, 24 Dec 2024 02:34:33 +0600
Subject: [PATCH] cha25

---
 docker-compose.yml         | 13 ++++---------
 docker/frontend/Dockerfile | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c628694..2ec712a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,13 +3,10 @@ version: '3.8'
 services:
   frontend:
     build:
-      context: ./frontend
-      dockerfile: ../docker/frontend/Dockerfile
+      context: .
+      dockerfile: docker/frontend/Dockerfile
     container_name: support-frontend
     restart: unless-stopped
-    volumes:
-      - ./frontend:/app
-      - /app/node_modules
     depends_on:
       - backend
 
@@ -35,13 +32,11 @@ services:
     ports:
       - "80:80"
     volumes:
-      - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./frontend/dist:/usr/share/nginx/html
       - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
-      - frontend_build:/usr/share/nginx/html
     depends_on:
       - frontend
       - backend
 
 volumes:
-  sqlite_data:
-  frontend_build:
\ No newline at end of file
+  sqlite_data:
\ No newline at end of file
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index cb7409a..18ddde1 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -3,11 +3,11 @@ FROM node:18-alpine as build
 WORKDIR /app
 
 # Copy package files
-COPY frontend/package*.json ./
+COPY package*.json ./
 RUN npm install
 
 # Copy source code
-COPY frontend/ .
+COPY . .
 
 # Build the app
 RUN npm run build
@@ -17,9 +17,11 @@ FROM nginx:alpine
 # Copy built files
 COPY --from=build /app/dist /usr/share/nginx/html
 
-# Copy nginx configurations
-COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
-COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
+# Create nginx config directory
+RUN mkdir -p /etc/nginx/conf.d
+
+# Copy nginx configuration
+COPY ../docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 
 # Create required directories and set permissions
 RUN mkdir -p /var/cache/nginx \
@@ -37,4 +39,7 @@ RUN mkdir -p /var/cache/nginx \
                  /var/cache/nginx/scgi_temp \
                  /var/run
 
+# Remove user directive from nginx config
+RUN sed -i '/user/d' /etc/nginx/nginx.conf
+
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file