1
0
mirror of https://gitlab.com/MoonTestUse1/AdministrationItDepartmens.git synced 2025-08-14 00:25:46 +02:00

Cейчас точно заработает

This commit is contained in:
1
2024-12-25 14:01:01 +06:00
parent 13797b9098
commit 1b7a2c7835
2 changed files with 18 additions and 28 deletions

View File

@@ -1,5 +1,3 @@
version: '3.8'
services: services:
frontend: frontend:
build: build:
@@ -7,8 +5,8 @@ services:
dockerfile: docker/frontend/Dockerfile dockerfile: docker/frontend/Dockerfile
container_name: support-frontend container_name: support-frontend
restart: unless-stopped restart: unless-stopped
depends_on: networks:
- backend - app-network
backend: backend:
build: build:
@@ -22,8 +20,8 @@ services:
volumes: volumes:
- ./backend:/app - ./backend:/app
- sqlite_data:/app/instance - sqlite_data:/app/instance
ports: networks:
- "8000:8000" - app-network
nginx: nginx:
build: build:
@@ -36,6 +34,12 @@ services:
depends_on: depends_on:
- frontend - frontend
- backend - backend
networks:
- app-network
networks:
app-network:
driver: bridge
volumes: volumes:
sqlite_data: sqlite_data:

View File

@@ -2,35 +2,21 @@ server {
listen 80; listen 80;
server_name localhost; server_name localhost;
root /usr/share/nginx/html;
index index.html;
# Основной маршрут для статических файлов
location / { location / {
try_files $uri $uri/ /index.html; proxy_pass http://frontend;
add_header Cache-Control "no-cache, no-store, must-revalidate"; 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/ { location /api/ {
proxy_pass http://backend:8000/api/; proxy_pass http://backend:8000;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_connect_timeout 60s;
proxy_send_timeout 60s;
proxy_read_timeout 60s;
} }
# Обработка ошибок
error_page 404 /index.html;
} }