From 342b67ba5f4caede950a2da818a8aee994e41e36 Mon Sep 17 00:00:00 2001 From: faulty Date: Wed, 18 Jan 2023 12:22:09 +0100 Subject: [PATCH] mod: dendrite addition --- custom/prometheus/prometheus.yml | 2 ++ docker-compose.base.yml | 1 + docker-compose.utils.yml | 36 ++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/custom/prometheus/prometheus.yml b/custom/prometheus/prometheus.yml index 65016f8..b9619f6 100644 --- a/custom/prometheus/prometheus.yml +++ b/custom/prometheus/prometheus.yml @@ -29,6 +29,8 @@ scrape_configs: - job_name: node static_configs: - targets: ['docker.host:9100'] + + # - job_name: dendrite - job_name: 'blackbox' metrics_path: /probe diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 7f7382d..5c96025 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -1,6 +1,7 @@ version: '2.2' networks: + internal: proxy: external: true diff --git a/docker-compose.utils.yml b/docker-compose.utils.yml index 9a9592d..a619822 100644 --- a/docker-compose.utils.yml +++ b/docker-compose.utils.yml @@ -84,6 +84,42 @@ services: networks: - proxy + + dendrite: + image: matrixdotorg/dentrite-monolith:latest + ports: + - 8008:8008 + - 8448:8448 + environment: + - SYNAPSE_CONFIG_DIR=/config + command: [ + "--tls-cert=server.crt", + "--tls-key=server.pem" + ] + volumes: + - /srv/dentrite/config:/etc/dentrite + - /srv/dentrite/data:/var/dentrite/media + depends_on: + - dendrite-pg + networks: + - internal + + + dendrite-pg: + image: postgres:14 + environment: + - POSTGRES_USER=dendrite + - POSTGRES_PASSWORD=dendrite + healthcheck: + test: ["CMD-SHELL", "pg_isready -U dendrite"] + interval: 5s + timeout: 5s + retries: 5 + volumes: + - /srv/dentrite/other/database:/var/lib/postgresql/data + networks: + - internal + grafana: image: grafana/grafana-oss:latest environment: