Reconcile: merge main back into dev #13

Merged
admin_emi merged 10 commits from main into dev 2026-07-23 16:22:22 +00:00
2 changed files with 7 additions and 5 deletions

View file

@ -102,3 +102,5 @@ THERMOGRAPH_DISCORD_APP_ID=... THERMOGRAPH_DISCORD_BOT_TOKEN=... \
``` ```
Global command changes can take up to an hour to propagate. Global command changes can take up to an hour to propagate.
<!-- monorepo cutover 2026-07-23 -->

View file

@ -44,7 +44,7 @@ services:
DB_MEMORY: ${DB_MEMORY:-16g} DB_MEMORY: ${DB_MEMORY:-16g}
volumes: volumes:
- pgdata:/var/lib/postgresql - pgdata:/var/lib/postgresql
- /opt/thermograph/deploy/db/init:/docker-entrypoint-initdb.d:ro - /opt/thermograph/infra/deploy/db/init:/docker-entrypoint-initdb.d:ro
networks: networks:
- internal - internal
healthcheck: healthcheck:
@ -85,7 +85,7 @@ services:
volumes: volumes:
- appdata:/state - appdata:/state
- applogs:/app/logs - applogs:/app/logs
- /opt/thermograph/deploy/stack/env-entrypoint.sh:/host/env-entrypoint.sh:ro - /opt/thermograph/infra/deploy/stack/env-entrypoint.sh:/host/env-entrypoint.sh:ro
- /etc/thermograph/stack.env:/host/thermograph.env:ro - /etc/thermograph/stack.env:/host/thermograph.env:ro
networks: networks:
- internal - internal
@ -124,7 +124,7 @@ services:
volumes: volumes:
- appdata:/state - appdata:/state
- applogs:/app/logs - applogs:/app/logs
- /opt/thermograph/deploy/stack/env-entrypoint.sh:/host/env-entrypoint.sh:ro - /opt/thermograph/infra/deploy/stack/env-entrypoint.sh:/host/env-entrypoint.sh:ro
- /etc/thermograph/stack.env:/host/thermograph.env:ro - /etc/thermograph/stack.env:/host/thermograph.env:ro
networks: networks:
- internal - internal
@ -147,7 +147,7 @@ services:
THERMOGRAPH_SERVICE_ROLE: frontend THERMOGRAPH_SERVICE_ROLE: frontend
THERMOGRAPH_API_BASE_INTERNAL: http://web:8137 THERMOGRAPH_API_BASE_INTERNAL: http://web:8137
volumes: volumes:
- /opt/thermograph/deploy/stack/env-entrypoint.sh:/host/env-entrypoint.sh:ro - /opt/thermograph/infra/deploy/stack/env-entrypoint.sh:/host/env-entrypoint.sh:ro
- /etc/thermograph/stack.env:/host/thermograph.env:ro - /etc/thermograph/stack.env:/host/thermograph.env:ro
networks: networks:
- internal - internal
@ -186,7 +186,7 @@ services:
COOLDOWN_SECONDS: ${COOLDOWN_SECONDS:-180} COOLDOWN_SECONDS: ${COOLDOWN_SECONDS:-180}
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- /opt/thermograph/deploy/stack/autoscale.sh:/host/autoscale.sh:ro - /opt/thermograph/infra/deploy/stack/autoscale.sh:/host/autoscale.sh:ro
networks: networks:
- internal - internal
deploy: deploy: