diff --git a/docker-compose.yml b/docker-compose.yml index 0fea816..04b4c8f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: frontend: build: @@ -7,6 +5,8 @@ services: dockerfile: docker/frontend/Dockerfile container_name: support-frontend restart: unless-stopped + ports: + - "3000:80" # Добавляем маппинг портов depends_on: - backend @@ -24,6 +24,7 @@ services: - sqlite_data:/app/instance ports: - "8081:8000" + nginx: build: context: ./docker/nginx @@ -31,10 +32,10 @@ services: container_name: support-nginx restart: unless-stopped ports: - - "8080:80" # Изменено с 80:80 на 8080:80 + - "8080:80" depends_on: - frontend - backend 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 317bd02..19e7bb1 100644 --- a/docker/nginx/conf.d/default.conf +++ b/docker/nginx/conf.d/default.conf @@ -2,17 +2,17 @@ server { listen 80; server_name localhost; - root /usr/share/nginx/html; - index index.html; - location / { - try_files $uri $uri/ /index.html; - expires -1; - add_header Cache-Control "no-store, no-cache, must-revalidate"; + proxy_pass http://frontend:80; # Проксируем на frontend сервис + 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; } location /api/ { - proxy_pass http://backend:8000/api/; + proxy_pass http://backend:8000/api/; # Используем порт 8000 как указано в docker-compose proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -22,4 +22,4 @@ server { proxy_send_timeout 60s; proxy_read_timeout 60s; } -} \ No newline at end of file +}