Dashboard (dashboard/src/dashboard.tsx, settings.tsx, apiAcademicPeriods.ts): - Refactor loadHolidayStatus to useCallback with stable empty-deps reference; removes location.pathname dependency that caused overlapping API calls at mount and left the banner unresolved via request-sequence cancellation - Add key prop derived from severity:text to Syncfusion MessageComponent to force remount on state change, fixing stale banner that ignored React prop/children updates - Correct German transliterated text to proper Umlauts throughout visible UI strings (fuer -> für, oe -> ö, ae -> ä etc. across dashboard and settings views) Backend (server/init_academic_periods.py): - Refactor to idempotent two-phase flow: seed default periods only when table is empty; on every run activate exactly the non-archived period covering date.today() - Enforces single-active invariant by deactivating all periods before promoting match - Emits explicit warning when no period covers current date instead of doing nothing Deployment (docker-compose.prod.yml): - Add init_academic_periods.py to server startup chain after migrations and defaults; eliminates manual post-deploy step to set an active academic period Release docs: - program-info.json: bump to 2026.1.0-alpha.16; fix JSON parse error caused by typographic curly quotes in the new changelog entry - TECH-CHANGELOG.md: detailed alpha.16 section with root-cause motivation for both dashboard refactoring decisions (unstable callback ref + Syncfusion stale render) - DEV-CHANGELOG.md: document dashboard refactor, Syncfusion key fix, Umlaut changes, and program-info JSON regression and fix - README.md: add Latest Release Highlights section for alpha.16 - .github/copilot-instructions.md: sync file map, prod bootstrap note, backend and frontend pattern additions for academic period init and Syncfusion remount pattern
150 lines
4.2 KiB
YAML
150 lines
4.2 KiB
YAML
networks:
|
|
infoscreen-net:
|
|
driver: bridge
|
|
|
|
services:
|
|
proxy:
|
|
image: nginx:1.25
|
|
container_name: infoscreen-proxy
|
|
restart: unless-stopped
|
|
ports:
|
|
- "80:80"
|
|
- "443:443"
|
|
volumes:
|
|
- ./nginx.conf:/etc/nginx/nginx.conf:ro
|
|
- ./certs:/etc/nginx/certs:ro
|
|
# Mount host media folder into nginx so it can serve uploaded media
|
|
- ./server/media/:/opt/infoscreen/server/media/:ro
|
|
depends_on:
|
|
- server
|
|
- dashboard
|
|
networks:
|
|
- infoscreen-net
|
|
|
|
db:
|
|
image: mariadb:11.2
|
|
container_name: infoscreen-db
|
|
restart: unless-stopped
|
|
environment:
|
|
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
|
|
MYSQL_DATABASE: ${DB_NAME}
|
|
MYSQL_USER: ${DB_USER}
|
|
MYSQL_PASSWORD: ${DB_PASSWORD}
|
|
volumes:
|
|
- db-data:/var/lib/mysql
|
|
networks:
|
|
- infoscreen-net
|
|
healthcheck:
|
|
test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
|
|
interval: 30s
|
|
timeout: 5s
|
|
retries: 3
|
|
start_period: 30s
|
|
|
|
mqtt:
|
|
image: eclipse-mosquitto:2.0.21
|
|
container_name: infoscreen-mqtt
|
|
restart: unless-stopped
|
|
volumes:
|
|
- ./mosquitto/config/mosquitto.conf:/mosquitto/config/mosquitto.conf:ro
|
|
ports:
|
|
- "1883:1883"
|
|
- "9001:9001"
|
|
networks:
|
|
- infoscreen-net
|
|
healthcheck:
|
|
test: ["CMD-SHELL", "mosquitto_pub -h localhost -t test -m 'health' || exit 1"]
|
|
interval: 30s
|
|
timeout: 5s
|
|
retries: 3
|
|
start_period: 10s
|
|
|
|
# Verwende fertige Images statt Build
|
|
server:
|
|
image: ghcr.io/robbstarkaustria/infoscreen-api:latest
|
|
container_name: infoscreen-api
|
|
restart: unless-stopped
|
|
depends_on:
|
|
db:
|
|
condition: service_healthy
|
|
mqtt:
|
|
condition: service_healthy
|
|
environment:
|
|
DB_CONN: "mysql+pymysql://${DB_USER}:${DB_PASSWORD}@db/${DB_NAME}"
|
|
DB_USER: ${DB_USER}
|
|
DB_PASSWORD: ${DB_PASSWORD}
|
|
DB_NAME: ${DB_NAME}
|
|
DB_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
|
|
DB_HOST: db
|
|
FLASK_ENV: production
|
|
FLASK_SECRET_KEY: ${FLASK_SECRET_KEY}
|
|
MQTT_BROKER_URL: mqtt://mqtt:1883
|
|
MQTT_USER: ${MQTT_USER}
|
|
MQTT_PASSWORD: ${MQTT_PASSWORD}
|
|
DEFAULT_SUPERADMIN_USERNAME: ${DEFAULT_SUPERADMIN_USERNAME:-superadmin}
|
|
DEFAULT_SUPERADMIN_PASSWORD: ${DEFAULT_SUPERADMIN_PASSWORD}
|
|
networks:
|
|
- infoscreen-net
|
|
healthcheck:
|
|
test: ["CMD", "curl", "-f", "http://localhost:8000/health"]
|
|
interval: 30s
|
|
timeout: 5s
|
|
retries: 3
|
|
start_period: 40s
|
|
command: >
|
|
bash -c "alembic -c /app/server/alembic.ini upgrade head &&
|
|
python /app/server/init_defaults.py &&
|
|
python /app/server/init_academic_periods.py &&
|
|
exec gunicorn server.wsgi:app --bind 0.0.0.0:8000"
|
|
|
|
dashboard:
|
|
image: ghcr.io/robbstarkaustria/infoscreen-dashboard:latest # Oder wo auch immer Ihre Images liegen
|
|
container_name: infoscreen-dashboard
|
|
restart: unless-stopped
|
|
depends_on:
|
|
server:
|
|
condition: service_healthy
|
|
environment:
|
|
NODE_ENV: production
|
|
VITE_API_URL: ${API_URL}
|
|
networks:
|
|
- infoscreen-net
|
|
|
|
listener:
|
|
image: ghcr.io/robbstarkaustria/infoscreen-listener:latest # Oder wo auch immer Ihre Images liegen
|
|
container_name: infoscreen-listener
|
|
restart: unless-stopped
|
|
depends_on:
|
|
db:
|
|
condition: service_healthy
|
|
mqtt:
|
|
condition: service_healthy
|
|
environment:
|
|
DB_CONN: "mysql+pymysql://${DB_USER}:${DB_PASSWORD}@db/${DB_NAME}"
|
|
DB_USER: ${DB_USER}
|
|
DB_PASSWORD: ${DB_PASSWORD}
|
|
DB_NAME: ${DB_NAME}
|
|
DB_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
|
|
networks:
|
|
- infoscreen-net
|
|
|
|
scheduler:
|
|
image: ghcr.io/robbstarkaustria/infoscreen-scheduler:latest
|
|
container_name: infoscreen-scheduler
|
|
restart: unless-stopped
|
|
depends_on:
|
|
# HINZUGEFÜGT: Stellt sicher, dass die DB vor dem Scheduler startet
|
|
db:
|
|
condition: service_healthy
|
|
mqtt:
|
|
condition: service_healthy
|
|
environment:
|
|
# HINZUGEFÜGT: Datenbank-Verbindungsstring
|
|
DB_CONN: "mysql+pymysql://${DB_USER}:${DB_PASSWORD}@db/${DB_NAME}"
|
|
MQTT_PORT: 1883
|
|
networks:
|
|
- infoscreen-net
|
|
|
|
volumes:
|
|
db-data:
|