matthias/dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.feuerwehr-rems.at/matthias/dashboard

Browse Source
This commit is contained in:
root
2026-02-27 13:47:35 +01:00
parent e945cefbd3 04d4f89834
commit b86f3022f7
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
docker-compose.yml
View File

@@ -12,7 +12,7 @@ services:
- postgres_data_prod:/var/lib/postgresql/data - postgres_data_prod:/var/lib/postgresql/data
- ./backend/src/database/migrations:/docker-entrypoint-initdb.d:ro - ./backend/src/database/migrations:/docker-entrypoint-initdb.d:ro
networks: networks:
- feuerwehr_network - dashboard-backend
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-prod_user} -d ${POSTGRES_DB:-feuerwehr_prod}"] test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-prod_user} -d ${POSTGRES_DB:-feuerwehr_prod}"]
interval: 10s interval: 10s
@@ -47,7 +47,7 @@ services:
postgres: postgres:
condition: service_healthy condition: service_healthy
networks: networks:
- feuerwehr_network - dashboard-backend
healthcheck: healthcheck:
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000/health"] test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:3000/health"]
interval: 30s interval: 30s
@@ -65,13 +65,21 @@ services:
VITE_AUTHENTIK_URL: ${VITE_AUTHENTIK_URL:?VITE_AUTHENTIK_URL is required} VITE_AUTHENTIK_URL: ${VITE_AUTHENTIK_URL:?VITE_AUTHENTIK_URL is required}
VITE_CLIENT_ID: ${AUTHENTIK_CLIENT_ID:?AUTHENTIK_CLIENT_ID is required} VITE_CLIENT_ID: ${AUTHENTIK_CLIENT_ID:?AUTHENTIK_CLIENT_ID is required}
container_name: feuerwehr_frontend_prod container_name: feuerwehr_frontend_prod
ports: labels:
- "${FRONTEND_PORT:-80}:80" - "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: depends_on:
backend: backend:
condition: service_healthy condition: service_healthy
networks: networks:
- feuerwehr_network - frontend
- dashboard-backend
healthcheck: healthcheck:
test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:80"] test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:80"]
interval: 30s interval: 30s
@@ -85,5 +93,6 @@ volumes:
driver: local driver: local
networks: networks:
feuerwehr_network: frontend:
driver: bridge external: true
dashboard-backend:

2
frontend/package-lock.json generated
View File

@@ -2563,4 +2563,4 @@
} }
} }
} }
} }