Prepare Matrix for migration and improve service health checks
- Updated .gitignore to selectively track Matrix config files - Allow: homeserver.yaml, *.log.config - Exclude: *.db*, media_store/, signing keys - Added Matrix configuration files to repository - Fixed BookStack environment variables (APP_KEY, DB_* pattern) - Improved health checks for BookStack, JupyterHub, and Synapse - All services now have proper health monitoring
This commit is contained in:
parent
8b0b23a872
commit
a52b5e23b1
4 changed files with 112 additions and 26 deletions
|
|
@ -27,8 +27,8 @@ services:
|
|||
condition: service_started
|
||||
labels:
|
||||
- "com.centurylinklabs.watchtower.enable=true"
|
||||
- "description=Studio EinsZwoVier PDF Cost Calculator"
|
||||
- "maintainer=Studio EinsZwoVier"
|
||||
- "description=studio einszwovier PDF Cost Calculator"
|
||||
- "maintainer=studio einszwovier"
|
||||
|
||||
synapse:
|
||||
image: matrixdotorg/synapse:latest
|
||||
|
|
@ -44,8 +44,7 @@ services:
|
|||
cpus: 2.0
|
||||
mem_reservation: 512m
|
||||
healthcheck:
|
||||
test:
|
||||
["CMD-SHELL", "curl -f http://localhost:8008/_matrix/static/ || exit 1"]
|
||||
test: ["CMD-SHELL", "curl -f http://localhost:8008/health || exit 1"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
|
|
@ -53,7 +52,7 @@ services:
|
|||
labels:
|
||||
- "com.centurylinklabs.watchtower.enable=true"
|
||||
- "description=Matrix homeserver for print orders"
|
||||
- "maintainer=Studio EinsZwoVier"
|
||||
- "maintainer=studio einszwovier"
|
||||
|
||||
ollama:
|
||||
image: ollama/ollama:latest
|
||||
|
|
@ -75,7 +74,7 @@ services:
|
|||
labels:
|
||||
- "com.centurylinklabs.watchtower.enable=true"
|
||||
- "description=Local LLM inference engine"
|
||||
- "maintainer=Studio EinsZwoVier"
|
||||
- "maintainer=studio einszwovier"
|
||||
|
||||
open-webui:
|
||||
image: ghcr.io/open-webui/open-webui:latest
|
||||
|
|
@ -102,16 +101,22 @@ services:
|
|||
labels:
|
||||
- "com.centurylinklabs.watchtower.enable=true"
|
||||
- "description=Web UI for Ollama LLM"
|
||||
- "maintainer=Studio EinsZwoVier"
|
||||
- "maintainer=studio einszwovier"
|
||||
|
||||
bookstack:
|
||||
image: lscr.io/linuxserver/bookstack:latest
|
||||
container_name: bookstack
|
||||
environment:
|
||||
- MYSQL_ROOT_PASSWORD=${BOOKSTACK_DB_PASSWORD}
|
||||
- MYSQL_DATABASE=${BOOKSTACK_DB_DATABASE}
|
||||
- MYSQL_USER=${BOOKSTACK_DB_USERNAME}
|
||||
- MYSQL_PASSWORD=${BOOKSTACK_DB_PASSWORD}
|
||||
- PUID=1000
|
||||
- PGID=1000
|
||||
- TZ=Europe/Berlin
|
||||
- APP_KEY=${BOOKSTACK_APP_KEY}
|
||||
- APP_URL=${BOOKSTACK_APP_URL}
|
||||
- DB_HOST=bookstack-mariadb
|
||||
- DB_PORT=3306
|
||||
- DB_DATABASE=${BOOKSTACK_DB_DATABASE}
|
||||
- DB_USERNAME=${BOOKSTACK_DB_USERNAME}
|
||||
- DB_PASSWORD=${BOOKSTACK_DB_PASSWORD}
|
||||
volumes:
|
||||
- ./bookstack/bookstack_app_data:/config
|
||||
ports:
|
||||
|
|
@ -121,11 +126,7 @@ services:
|
|||
bookstack-mariadb:
|
||||
condition: service_healthy
|
||||
healthcheck:
|
||||
test:
|
||||
[
|
||||
"CMD-SHELL",
|
||||
"mariadb -u${BOOKSTACK_DB_USERNAME} -p${BOOKSTACK_DB_PASSWORD} -e 'SELECT 1' || exit 1",
|
||||
]
|
||||
test: ["CMD-SHELL", "curl -f http://localhost:80 || exit 1"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
|
|
@ -133,7 +134,7 @@ services:
|
|||
labels:
|
||||
- "com.centurylinklabs.watchtower.enable=true"
|
||||
- "description=BookStack Documentation Wiki"
|
||||
- "maintainer=Studio EinsZwoVier"
|
||||
- "maintainer=studio einszwovier"
|
||||
|
||||
bookstack-mariadb:
|
||||
image: lscr.io/linuxserver/mariadb:latest
|
||||
|
|
@ -164,7 +165,7 @@ services:
|
|||
labels:
|
||||
- "com.centurylinklabs.watchtower.enable=true"
|
||||
- "description=MariaDB Database for BookStack"
|
||||
- "maintainer=Studio EinsZwoVier"
|
||||
- "maintainer=studio einszwovier"
|
||||
|
||||
watchtower:
|
||||
image: containrrr/watchtower:latest
|
||||
|
|
@ -185,7 +186,7 @@ services:
|
|||
retries: 3
|
||||
labels:
|
||||
- "description=Watchtower Auto-Update Service"
|
||||
- "maintainer=Studio EinsZwoVier"
|
||||
- "maintainer=studio einszwovier"
|
||||
|
||||
portainer:
|
||||
image: portainer/portainer-ce:latest
|
||||
|
|
@ -209,7 +210,7 @@ services:
|
|||
start_period: 30s
|
||||
labels:
|
||||
- "description=Portainer Container Management UI"
|
||||
- "maintainer=Studio EinsZwoVier"
|
||||
- "maintainer=studio einszwovier"
|
||||
|
||||
jupyterhub:
|
||||
build: ./jupyterhub
|
||||
|
|
@ -231,10 +232,20 @@ services:
|
|||
cpus: 1.0
|
||||
depends_on:
|
||||
- web
|
||||
healthcheck:
|
||||
test:
|
||||
[
|
||||
"CMD-SHELL",
|
||||
"curl -f http://localhost:8001/hub/health || curl -f http://localhost:8001/hub/ || exit 1",
|
||||
]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 60s
|
||||
labels:
|
||||
- "com.centurylinklabs.watchtower.enable=true"
|
||||
- "description=JupyterHub for interactive notebooks"
|
||||
- "maintainer=Studio EinsZwoVier"
|
||||
- "maintainer=studio einszwovier"
|
||||
|
||||
forgejo:
|
||||
image: codeberg.org/forgejo/forgejo:11
|
||||
|
|
@ -262,7 +273,7 @@ services:
|
|||
labels:
|
||||
- "com.centurylinklabs.watchtower.enable=true"
|
||||
- "description=Forgejo Git Server"
|
||||
- "maintainer=Studio EinsZwoVier"
|
||||
- "maintainer=studio einszwovier"
|
||||
|
||||
element-web:
|
||||
image: vectorim/element-web:latest
|
||||
|
|
@ -299,5 +310,5 @@ networks:
|
|||
default:
|
||||
name: einszwovier_network
|
||||
labels:
|
||||
- "description=Studio EinsZwoVier network"
|
||||
- "maintainer=Studio EinsZwoVier"
|
||||
- "description=studio einszwovier network"
|
||||
- "maintainer=studio einszwovier"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue