From 29886811e3b91f034e35aa71be996fe53be89089 Mon Sep 17 00:00:00 2001 From: 1 Date: Wed, 25 Dec 2024 13:05:48 +0600 Subject: [PATCH] check nginx --- docker-compose.yml | 6 +++--- docker/nginx/Dockerfile | 23 +++++++++++------------ docker/nginx/conf.d/default.conf | 9 +++------ 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 301be8e..009a640 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,12 +25,12 @@ services: nginx: build: - context: ./docker/nginx - dockerfile: Dockerfile + context: . + dockerfile: docker/nginx/Dockerfile container_name: support-nginx restart: unless-stopped ports: - - "80:80" # Возвращаем стандартный порт + - "80:80" depends_on: - frontend - backend diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index a4cff8f..f6c7d23 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,18 +1,17 @@ FROM nginx:alpine -# Copy configuration files -COPY nginx.conf /etc/nginx/nginx.conf -COPY conf.d/default.conf /etc/nginx/conf.d/default.conf - -RUN mkdir -p /var/cache/nginx \ -12,21 +12,11 @@ RUN mkdir -p /var/cache/nginx \ +# Создаем необходимые директории +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 -R 755 /var/cache/nginx \ - && chmod -R 755 /etc/nginx \ - && chown -R nginx:nginx /var/cache/nginx \ - && chown -R nginx:nginx /etc/nginx + /var/cache/nginx/scgi_temp -EXPOSE 8000 +# Копируем конфигурацию +COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf +COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf + +EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf index 9cf0920..4741230 100644 --- a/docker/nginx/conf.d/default.conf +++ b/docker/nginx/conf.d/default.conf @@ -1,20 +1,17 @@ server { listen 80; - server_name localhost; + server_name _; # Обрабатывает все входящие запросы 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; add_header Cache-Control "no-store, no-cache, must-revalidate"; } + # Проксирование API запросов на бэкенд location /api/ { proxy_pass http://backend:8000/api/; proxy_http_version 1.1;