From 272d38204f6ce3f3657ec531216c736ff94e5303 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Fri, 28 Mar 2025 21:42:19 +0100
Subject: [PATCH] pg16 to 17

---
 peach/docker-compose.yml | 50 +++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index fc4906c..457297f 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -1,4 +1,6 @@
 volumes:
+    conduwuit-db:
+        external: true
     ssl:
         external: true
     victoria-metrics:
@@ -22,12 +24,19 @@ networks:
                   gateway: 2a01:e0a:5b7:35f1::1
 
 services:
-    postgres:
+    postgres16:
         image: postgres:16-alpine
         volumes:
             - postgres-16:/var/lib/postgresql/data
             - ssl:/ssl:ro
-        dns: fd00::3:2
+        environment:
+            - POSTGRES_PASSWORD=J5PdCv9ObVh5uZCJDpndzXoUumAKn52K
+        restart: always
+    postgres:
+        image: postgres:17-alpine
+        volumes:
+            - postgres-17:/var/lib/postgresql/data
+            - ssl:/ssl:ro
         environment:
             - POSTGRES_PASSWORD=J5PdCv9ObVh5uZCJDpndzXoUumAKn52K
         networks:
@@ -213,7 +222,7 @@ services:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::853
     gitea:
-        image: codeberg.org/forgejo/forgejo:7
+        image: codeberg.org/forgejo/forgejo:10
         volumes:
             - /srv/docker/volume/gitea/data:/data
         restart: always
@@ -243,8 +252,18 @@ services:
         image: ghcr.io/matrix-org/sliding-sync:latest
         env_file: env/matrixsyncv3
         restart: always
+    conduwuit:
+        image: girlbossceo/conduwuit
+        env_file: env/conduwuit
+        volumes:
+            - /srv/docker/volume/conduwuit/config:/config:ro
+            - /srv/docker/volume/conduwuit/db-backup:/db-backup:rw
+            - conduwuit-db:/db:rw
+        restart: always
+        mem_limit: 2G
+        cpus: 1
     dendrite:
-        image: matrixdotorg/dendrite-monolith:latest
+        image: matrixdotorg/dendrite-monolith:main
         volumes:
             - /srv/docker/volume/dendrite/dendrite.yaml:/etc/dendrite/dendrite.yaml:ro
             - /srv/docker/volume/dendrite/cert:/cert:ro
@@ -288,6 +307,7 @@ services:
     mosquitto:
         image: eclipse-mosquitto
         volumes:
+          - ssl:/ssl:ro
           - /srv/docker/volume/mosquitto/config:/mosquitto/config
           - /srv/docker/volume/mosquitto/data:/mosquitto/data
         ports:
@@ -321,29 +341,7 @@ services:
           - env/vector
         volumes:
           - /srv/docker/volume/vector/vector.yaml:/etc/vector/vector.yaml:ro
-        depends_on:
-          - victorialogs
         restart: unless-stopped
-    victorialogs:
-        image: victoriametrics/victoria-logs:latest-scratch
-        env_file:
-            - env/victorialogs
-        volumes:
-          - /srv/docker/volume/victoria-logs/data:/vlogs
-        command:
-          - -storageDataPath=/vlogs
-          - -loggerFormat=json
-          - -syslog.listenAddr.tcp=:514 
-          - -syslog.listenAddr.udp=:514
-        ports:
-          - 514:514                      # syslog/tcp
-          - 514:514/udp                  # syslog/udp
-        depends_on:
-          - caddy
-        restart: unless-stopped
-        networks:
-            default:
-                ipv6_address: 2a01:e0a:5b7:35f1::5000
     vikunja:
         image: vikunja/vikunja
         env_file: