Merge pull request 'feat: update docker-compose and Nginx configuration for improved service dependencies and API routing' (#1) from develop into main
Some checks failed
Deploy Production / deploy (push) Successful in 37s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 6s
Test Suite / playwright-tests (push) Failing after 1m56s

Reviewed-on: #1
This commit is contained in:
Lars 2026-04-29 08:52:11 +02:00
commit 2f54fef88e
3 changed files with 35 additions and 1 deletions

View File

@ -18,5 +18,6 @@ jobs:
docker compose build --no-cache
docker compose up -d
sleep 5
curl -sf http://localhost:8003/api/version && echo "✓ PROD API healthy"
curl -sf http://localhost:8003/api/version && echo "✓ PROD API (direkt) healthy"
curl -sf http://localhost:3003/api/version && echo "✓ PROD API über Frontend-Nginx (wie Browser) healthy"
echo "=== Shinkan PROD Deploy complete ==="

View File

@ -56,6 +56,8 @@ services:
container_name: shinkan-ui
ports:
- "3003:80"
depends_on:
- backend
restart: unless-stopped
networks:
- shinkan-network

View File

@ -4,6 +4,37 @@ server {
root /usr/share/nginx/html;
index index.html;
# Uploads (Übungsmedien) und API erreichen Clients unter derselben Host-URL wie die SPA
# dafür muss Nginx zur FastAPI-Instanz im Compose-Netz weiterleiten.
client_max_body_size 64m;
location ^~ /api/ {
proxy_pass http://backend:8000;
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;
proxy_connect_timeout 60s;
proxy_send_timeout 300s;
proxy_read_timeout 300s;
}
location ^~ /media/ {
proxy_pass http://backend:8000;
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 = /health {
proxy_pass http://backend:8000/health;
proxy_http_version 1.1;
proxy_set_header Host $host;
}
# SPA routing - serve index.html for all routes
location / {
try_files $uri $uri/ /index.html;