peach/docker-compose.yml

@@ -1,8 +1,14 @@
+version: "3.9"
+
 volumes:
     ssl:
         external: true
     victoria-metrics:
         external: true
+    haproxy-socket:
+        external: true
+    postgres-13:
+        external: true
     postgres-15:
         external: true
 
@@ -41,6 +47,23 @@ services:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::5432
         restart: always
+    haproxy:
+        image: haproxytech/haproxy-alpine-quic:2.8
+        volumes:
+            - ssl:/ssl:rw
+            - /etc/haproxy:/usr/local/etc/haproxy:ro
+            - /etc/haproxy:/etc/haproxy:ro
+            - haproxy-socket:/var/lib/haproxy:rw
+        ports:
+            - 443:443
+            - 443:443/udp
+            - 80:80
+        restart: always
+        mem_limit: 512M
+        dns: fd00::3:2
+        networks:
+            default:
+                ipv6_address: 2a01:e0a:5b7:35f1::443
     vault:
         image: hashicorp/vault
         volumes:
@@ -52,22 +75,15 @@ services:
           - IPC_LOCK
         command: vault server -config /vault/config
     caddy:
-        image: caddy-alpine
+        image: caddy:alpine
         volumes:
             - ssl:/etc/dehydrated:ro
             - /etc/caddy:/etc/caddy
             - /srv/www:/srv/www
             - /srv/www/nfs/kiwi/Videos:/srv/www/nfs/kiwi/Videos:ro
         restart: always
-        ports:
-            - 443:443
-            - 443:443/udp
-            - 80:80
         mem_limit: 128M
-        command: caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
-        networks:
-            default:
-                ipv6_address: 2a01:e0a:5b7:35f1::443
+        dns: 192.168.3.2
     redis:
         image: redis:alpine
         restart: always
@@ -245,7 +261,7 @@ services:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::853
     gitea:
-        image: codeberg.org/forgejo/forgejo:7
+        image: gitea/gitea:dev
         volumes:
             - /srv/docker/volume/gitea/data:/data
         restart: always
@@ -295,7 +311,7 @@ services:
         restart: always
         command: /bin/syncv3
         mem_limit: 1G
-        cpus: 1
+        cpus: 0.5
     dendrite:
         image: matrixdotorg/dendrite-monolith:latest
         volumes:
@@ -306,13 +322,13 @@ services:
             - /srv/docker/volume/dendrite/jetstream:/var/dendrite/jetstream
         restart: always
         mem_limit: 1G
-        cpus: 1
+        cpus: 0.5
     matrix-alertmanager:
         image: jaywink/matrix-alertmanager:latest
         env_file: env/matrix-alertmanager
         restart: always
         mem_limit: 1G
-        cpus: 1
+        cpus: 0.5
     uptime-kuma:
         image: louislam/uptime-kuma
         volumes:
@@ -320,11 +336,20 @@ services:
         restart: always
         mem_limit: 2G
         cpus: 1
-    openspeedtest:
-        environment:
-          - ENABLE_LETSENCRYPT=False
-          - DOMAIN_NAME=speedtest.verry.org
-        image: "openspeedtest/latest"
+    vikunja-api:
+        image: vikunja/api:latest
+        env_file: env/vikunja-api
+        volumes:
+          - /srv/docker/volume/vikunja/api/files:/app/vikunja/files:rw
+        restart: always
+        mem_limit: 1G
+        cpus: 0.5
+    vikunja-frontend:
+        image: vikunja/frontend
+        env_file: env/vikunja-frontend
+        restart: always
+        mem_limit: 512M
+        cpus: 0.5
     geoipupdate:
         image: "maxmindinc/geoipupdate:latest"
         volumes:

peach/reload.sh

@@ -3,5 +3,5 @@
 
 cd "$(dirname "$0")"
 
-#docker-compose pull --ignore-pull-failures
+docker-compose pull --ignore-pull-failures
 docker-compose up -d