From ab67dee15f2f0ef4e7630427ba615fc49e590dc4 Mon Sep 17 00:00:00 2001
From: MoonTestUse1 <crocoman7887@gmail.com>
Date: Tue, 24 Dec 2024 00:08:07 +0600
Subject: [PATCH] change docker

---
 docker-compose.yml               | 11 +++++------
 docker/backend/Dockerfile        | 11 ++++++++---
 docker/frontend/Dockerfile       | 13 ++++++++++---
 docker/nginx/conf.d/default.conf |  1 -
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e96788b..e08713f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,16 +3,16 @@ version: '3.8'
 services:
   frontend:
     build:
-      context: ./frontend
-      dockerfile: Dockerfile
+      context: .
+      dockerfile: docker/frontend/Dockerfile
     container_name: support-frontend
     volumes:
       - frontend_build:/app/dist
 
   backend:
     build:
-      context: ./backend
-      dockerfile: Dockerfile
+      context: .
+      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
-      - ./nginx/conf.d:/etc/nginx/conf.d:ro
+      - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
     depends_on:
       - frontend
       - backend
diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
index 456e40c..76d6c6e 100644
--- a/docker/backend/Dockerfile
+++ b/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"]
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index 9bfa652..efb0358 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -2,11 +2,18 @@ FROM node:18-alpine as builder
 
 WORKDIR /app
 
-COPY package*.json ./
-RUN npm install
+# Копируем файлы package.json
+COPY frontend/package*.json ./
 
-COPY . .
+# Устанавливаем зависимости
+RUN npm ci
+
+# Копируем исходники
+COPY frontend/ ./
+
+# Собираем приложение
 RUN npm run build
 
+# Финальный этап
 FROM scratch
 COPY --from=builder /app/dist /dist
diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf
index 53b1155..8b2d371 100644
--- a/docker/nginx/conf.d/default.conf
+++ b/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/ {