cha2524222fvdfа

docker-compose.yml

@@ -1,29 +1,42 @@
 version: '3.8'
 
 services:
+  nginx:
+    image: nginx:alpine
+    container_name: support-nginx
+    ports:
+      - "80:80"
+    volumes:
+      - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
+      - frontend_build:/usr/share/nginx/html
+    depends_on:
+      - frontend
+      - backend
+
   frontend:
     build:
       context: .
       dockerfile: docker/frontend/Dockerfile
     container_name: support-frontend
-    ports:
+    volumes:
-      - "80:80"
+      - frontend_build:/app/dist
-    depends_on:
-      - backend
 
   backend:
     build:
       context: .
       dockerfile: docker/backend/Dockerfile
     container_name: support-backend
+    restart: unless-stopped
     environment:
       - TELEGRAM_BOT_TOKEN=7677506032:AAHEqNUr1lIUfNVbLwaWIaPeKKShsCyz3eo
       - TELEGRAM_CHAT_ID=-1002037023574
     volumes:
       - ./backend:/app
       - sqlite_data:/app/instance
-    ports:
+    expose:
-      - "8000:8000"
+      - "8000"
 
 volumes:
   sqlite_data:
+  frontend_build:

docker/frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine as build
+FROM node:18-alpine
 
 WORKDIR /app
 
@@ -10,36 +10,4 @@ RUN npm install
 COPY frontend/ .
 
 # Build the app
-RUN npm run build
+CMD ["npm", "run", "build"]
-
-FROM nginx:alpine
-
-# 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/conf.d/default.conf /etc/nginx/conf.d/default.conf
-
-# Create required directories and set permissions
-RUN mkdir -p /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 \
-    && 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
-
-# Remove user directive from nginx config
-RUN sed -i '/user/d' /etc/nginx/nginx.conf
-
-CMD ["nginx", "-g", "daemon off;"]