From b87b43433e1243d3c2cd72cee44681faa4e548bc Mon Sep 17 00:00:00 2001
From: 1 <crocoman7887@gmail.com>
Date: Wed, 25 Dec 2024 12:58:12 +0600
Subject: [PATCH] check nginx

---
 docker-compose.yml               | 13 ++++++++-----
 docker/frontend/Dockerfile       | 23 +++++++++--------------
 docker/nginx/conf.d/default.conf |  6 +++++-
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 693fdf2..62cbfa4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,9 @@ services:
       context: .
       dockerfile: docker/frontend/Dockerfile
     container_name: support-frontend
+    volumes:
+      - ./frontend:/app
+      - /app/node_modules
     restart: unless-stopped
     depends_on:
       - backend
@@ -24,13 +27,13 @@ services:
       - "8000"
 
   nginx:
-    build:
-      context: ./docker/nginx
-      dockerfile: Dockerfile
+    image: nginx:alpine
     container_name: support-nginx
-    restart: unless-stopped
+    volumes:
+      - ./frontend/dist:/usr/share/nginx/html
+      - ./docker/nginx/conf.d:/etc/nginx/conf.d
     ports:
-      - "80:80"  # Меняем на стандартный порт 80
+      - "8080:80"
     depends_on:
       - frontend
       - backend
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index cd95686..cc4db67 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -1,23 +1,18 @@
-FROM node:18-alpine as build
+FROM node:18-alpine
 
 WORKDIR /app
 
-# Установите зависимости
+# Копируем package.json и package-lock.json
 COPY frontend/package*.json ./
+
+# Устанавливаем зависимости
 RUN npm install
 
-# Скопируйте исходный код и соберите приложение
+# Копируем исходный код
 COPY frontend/ .
+
+# Собираем приложение
 RUN npm run build
 
-FROM nginx:alpine
-
-# Скопируйте собранные файлы в Nginx
-COPY --from=build /app/dist /usr/share/nginx/html
-
-# Скопируйте конфигурацию Nginx
-COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
-
-EXPOSE 80
-
-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+# Оставляем контейнер запущенным
+CMD ["tail", "-f", "/dev/null"]
diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf
index 30c3cbe..9cf0920 100644
--- a/docker/nginx/conf.d/default.conf
+++ b/docker/nginx/conf.d/default.conf
@@ -1,10 +1,14 @@
 server {
     listen 80;
-    server_name 185.139.70.62;  # Изменяем на IP сервера
+    server_name localhost;
 
     root /usr/share/nginx/html;
     index index.html;
 
+    # Добавляем заголовки для отладки
+    add_header X-Debug-Path $request_uri;
+    add_header X-Debug-Root $document_root;
+
     location / {
         try_files $uri $uri/ /index.html;
         expires -1;