Merge remote changes and resolve conflicts

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

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;"]
+CMD ["nginx", "-g", "daemon off;"]