change docker

docker-compose.yml

@@ -3,16 +3,16 @@ version: '3.8'
 services:
   frontend:
     build:
-      context: ./frontend
+      context: .
-      dockerfile: Dockerfile
+      dockerfile: docker/frontend/Dockerfile
     container_name: support-frontend
     volumes:
       - frontend_build:/app/dist
 
   backend:
     build:
-      context: ./backend
+      context: .
-      dockerfile: Dockerfile
+      dockerfile: docker/backend/Dockerfile
     container_name: support-backend
     environment:
       - TELEGRAM_BOT_TOKEN=7677506032:AAHEqNUr1lIUfNVbLwaWIaPeKKShsCyz3eo
@@ -27,8 +27,7 @@ services:
       - "80:80"
     volumes:
       - frontend_build:/usr/share/nginx/html:ro
-      - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
-      - ./nginx/conf.d:/etc/nginx/conf.d:ro
     depends_on:
       - frontend
       - backend

docker/backend/Dockerfile

@@ -2,9 +2,14 @@ FROM python:3.11-slim
 
 WORKDIR /app
 
-COPY requirements.txt .
+# Копируем requirements.txt
+COPY backend/requirements.txt .
+
+# Устанавливаем зависимости
 RUN pip install --no-cache-dir -r requirements.txt
 
-COPY . .
+# Копируем исходники
+COPY backend/ .
 
-CMD ["uvicorn", "run.py"]
+# Запускаем приложение
+CMD ["python", "run.py"]

docker/frontend/Dockerfile

@@ -2,11 +2,18 @@ FROM node:18-alpine as builder
 
 WORKDIR /app
 
-COPY package*.json ./
+# Копируем файлы package.json
-RUN npm install
+COPY frontend/package*.json ./
 
-COPY . .
+# Устанавливаем зависимости
+RUN npm ci
+
+# Копируем исходники
+COPY frontend/ ./
+
+# Собираем приложение
 RUN npm run build
 
+# Финальный этап
 FROM scratch
 COPY --from=builder /app/dist /dist

docker/nginx/conf.d/default.conf

@@ -7,7 +7,6 @@ server {
 
     location / {
         try_files $uri $uri/ /index.html;
-        add_header Cache-Control "no-store, no-cache, must-revalidate";
     }
 
     location /api/ {