diff --git a/docker-compose.yml b/docker-compose.yml index 595d1a6..18e4ac0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: - postgres_data_prod:/var/lib/postgresql/data - ./backend/src/database/migrations:/docker-entrypoint-initdb.d:ro networks: - - feuerwehr_network + - dashboard-backend healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-prod_user} -d ${POSTGRES_DB:-feuerwehr_prod}"] interval: 10s @@ -47,7 +47,7 @@ services: postgres: condition: service_healthy networks: - - feuerwehr_network + - dashboard-backend healthcheck: test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000/health"] interval: 30s @@ -65,13 +65,21 @@ services: VITE_AUTHENTIK_URL: ${VITE_AUTHENTIK_URL:?VITE_AUTHENTIK_URL is required} VITE_CLIENT_ID: ${AUTHENTIK_CLIENT_ID:?AUTHENTIK_CLIENT_ID is required} container_name: feuerwehr_frontend_prod - ports: - - "${FRONTEND_PORT:-80}:80" + labels: + - "traefik.enable=true" + - "traefik.http.routers.feuerwehr-frontend.entrypoints=websecure" + - "traefik.http.routers.feuerwehr-frontend.rule=Host(`start.feuerwehr-rems.at`)" + - "traefik.http.routers.feuerwehr-frontend.tls=true" + - "traefik.http.routers.feuerwehr-frontend.tls.certresolver=letsencrypt" + - "traefik.http.routers.feuerwehr-frontend.service=feuerwehr-frontend" + - "traefik.http.services.feuerwehr-frontend.loadbalancer.server.port=80" + - "traefik.docker.network=frontend" depends_on: backend: condition: service_healthy networks: - - feuerwehr_network + - frontend + - dashboard-backend healthcheck: test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:80"] interval: 30s @@ -85,5 +93,6 @@ volumes: driver: local networks: - feuerwehr_network: - driver: bridge + frontend: + external: true + dashboard-backend: diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 4b22ecc..bd31cc0 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2563,4 +2563,4 @@ } } } -} +} \ No newline at end of file