diff --git a/backend/Dockerfile b/backend/Dockerfile index 468f854..2b4a46c 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -6,6 +6,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends postgresql-clie WORKDIR /app +ENV PYTHONPATH=/app + COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt @@ -13,4 +15,4 @@ COPY . . RUN chmod +x entrypoint.sh -CMD ["./entrypoint.sh"] +CMD ["bash", "entrypoint.sh"] diff --git a/nginx/nginx.conf b/nginx/nginx.conf index eb50e14..5014a8e 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -1,16 +1,21 @@ server { listen 80; + # Docker внутренний DNS — резолвим хосты в момент запроса, а не при старте nginx + resolver 127.0.0.11 valid=30s; + # API запросы → FastAPI backend location /api/ { - proxy_pass http://backend:8000; + set $backend http://backend:8000; + proxy_pass $backend; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; } # Всё остальное → Vite dev server (с поддержкой WebSocket для HMR) location / { - proxy_pass http://frontend:5173; + set $frontend http://frontend:5173; + proxy_pass $frontend; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade";