From 1b7a2c783515ccd24ddf88e09398866684833911 Mon Sep 17 00:00:00 2001
From: 1 <crocoman7887@gmail.com>
Date: Wed, 25 Dec 2024 14:01:01 +0600
Subject: [PATCH] =?UTF-8?q?C=D0=B5=D0=B9=D1=87=D0=B0=D1=81=20=D1=82=D0=BE?=
 =?UTF-8?q?=D1=87=D0=BD=D0=BE=20=D0=B7=D0=B0=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B5=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml               | 18 +++++++++++-------
 docker/nginx/conf.d/default.conf | 28 +++++++---------------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 800c16f..009a640 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   frontend:
     build:
@@ -7,8 +5,8 @@ services:
       dockerfile: docker/frontend/Dockerfile
     container_name: support-frontend
     restart: unless-stopped
-    depends_on:
-      - backend
+    networks:
+      - app-network
 
   backend:
     build:
@@ -22,8 +20,8 @@ services:
     volumes:
       - ./backend:/app
       - sqlite_data:/app/instance
-    ports:
-      - "8000:8000"
+    networks:
+      - app-network
 
   nginx:
     build:
@@ -36,6 +34,12 @@ services:
     depends_on:
       - frontend
       - backend
+    networks:
+      - app-network
+
+networks:
+  app-network:
+    driver: bridge
 
 volumes:
-  sqlite_data:
\ No newline at end of file
+  sqlite_data:
diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf
index baffc3b..b2de9ee 100644
--- a/docker/nginx/conf.d/default.conf
+++ b/docker/nginx/conf.d/default.conf
@@ -2,35 +2,21 @@ server {
     listen 80;
     server_name localhost;
 
-    root /usr/share/nginx/html;
-    index index.html;
-
-    # Основной маршрут для статических файлов
     location / {
-        try_files $uri $uri/ /index.html;
-        add_header Cache-Control "no-cache, no-store, must-revalidate";
+        proxy_pass http://frontend;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_cache_bypass $http_upgrade;
     }
 
-    # Маршрут для админ-панели
-    location /admin {
-        alias /usr/share/nginx/html;
-        try_files $uri $uri/ /index.html;
-        add_header Cache-Control "no-cache, no-store, must-revalidate";
-    }
-
-    # API прокси
     location /api/ {
-        proxy_pass http://backend:8000/api/;
+        proxy_pass http://backend:8000;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_connect_timeout 60s;
-        proxy_send_timeout 60s;
-        proxy_read_timeout 60s;
     }
-
-    # Обработка ошибок
-    error_page 404 /index.html;
 }