Further docker advances

This commit is contained in:
Nexus 2024-06-10 17:03:58 +01:00
parent 90c7293d14
commit 85ab1f9539
Signed by: nex
GPG key ID: 0FA334385D0B689F
3 changed files with 31 additions and 3 deletions

25
docker-compose.yml Normal file
View file

@ -0,0 +1,25 @@
services:
sentient-jimmy:
image: sentient-jimmy:latest
depends_on:
db:
condition: service_healthy
environment:
- DATABASE_URL=postgres://postgres:password@db:5432/postgres
volumes:
- ./config.toml:/jimmy/config.toml:ro
db:
image: postgres:16
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=password
- POSTGRES_DB=postgres
volumes:
- postgres_data:/var/lib/postgresql/data/
healthcheck:
test: [ "CMD-SHELL", "pg_isready -U postgres" ]
interval: 1s
timeout: 30s
retries: 10
volumes:
postgres_data:

View file

@ -1,3 +1,4 @@
import os
import tomllib import tomllib
import logging import logging
from typing import Callable from typing import Callable
@ -66,4 +67,6 @@ def get_config():
_loaded.setdefault("servers", {}) _loaded.setdefault("servers", {})
_loaded["servers"].setdefault("order", []) _loaded["servers"].setdefault("order", [])
_loaded.setdefault("bot", {}) _loaded.setdefault("bot", {})
if database_url := os.getenv("DATABASE_URL"):
_loaded["bot"]["db_url"] = database_url
return _loaded return _loaded