From 40f0dda8f0b62604dad329413f30f4c312704317 Mon Sep 17 00:00:00 2001
From: MoonTestUse1 <crocoman7887@gmail.com>
Date: Wed, 25 Dec 2024 04:28:47 +0600
Subject: [PATCH] Merge remote changes and resolve conflicts

---
 docker-compose.yml         |  2 --
 docker/frontend/Dockerfile | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8b4c563..1de4ad2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,8 +9,6 @@ services:
       - "80:80"
       - "443:443"
     volumes:
-      - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
       - certbot-etc:/etc/letsencrypt
       - certbot-var:/var/lib/letsencrypt
       - webroot:/var/www/html
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index d33e045..db8c6d0 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -2,7 +2,7 @@ FROM node:18-alpine as build
 
 WORKDIR /app
 
-# Copy package files from frontend directory
+# Copy package files
 COPY frontend/package*.json ./
 RUN npm install
 
@@ -14,16 +14,17 @@ RUN npm run build
 
 FROM nginx:alpine
 
+# Remove default nginx config
+RUN rm /etc/nginx/conf.d/default.conf
+
 # Copy built files
 COPY --from=build /app/dist /usr/share/nginx/html
 
-# Create nginx config directory
-RUN mkdir -p /etc/nginx/conf.d
-
 # Copy nginx configuration
+COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
 COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 
-# Create required directories and set permissions
+# Create required directories
 RUN mkdir -p /var/cache/nginx \
              /var/cache/nginx/client_temp \
              /var/cache/nginx/proxy_temp \
@@ -31,14 +32,9 @@ RUN mkdir -p /var/cache/nginx \
              /var/cache/nginx/uwsgi_temp \
              /var/cache/nginx/scgi_temp \
              /var/run \
-    && chmod 777 /var/cache/nginx \
-                 /var/cache/nginx/client_temp \
-                 /var/cache/nginx/proxy_temp \
-                 /var/cache/nginx/fastcgi_temp \
-                 /var/cache/nginx/uwsgi_temp \
-                 /var/cache/nginx/scgi_temp \
-                 /var/run
+             /etc/letsencrypt \
+             /var/www/html
 
-# Remove user directive from nginx config
+EXPOSE 80 443
 
-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+CMD ["nginx", "-g", "daemon off;"]