diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index 99432af..1a8eb29 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -3,6 +3,10 @@ version: "3.9" volumes: ssl: external: true + mariadb-data: + external: true + lumieredesoy-ghost-data: + external: true victoria-metrics: external: true haproxy-socket: @@ -48,9 +52,9 @@ services: ipv6_address: 2a01:e0a:5b7:35f1::5432 restart: always haproxy: - image: haproxytech/haproxy-alpine-quic:2.8 + image: haproxy:alpine volumes: - - ssl:/ssl:rw + - ssl:/ssl:ro - /etc/haproxy:/usr/local/etc/haproxy:ro - /etc/haproxy:/etc/haproxy:ro - haproxy-socket:/var/lib/haproxy:rw @@ -59,7 +63,7 @@ services: - 443:443/udp - 80:80 restart: always - mem_limit: 512M + mem_limit: 128M dns: fd00::3:2 networks: default: @@ -80,7 +84,6 @@ services: - 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 mem_limit: 128M dns: 192.168.3.2 @@ -96,6 +99,25 @@ services: networks: default: ipv6_address: 2a01:e0a:5b7:35f1::6379 + mariadb: + image: mariadb + volumes: + - mariadb-data:/var/lib/mysql + - ssl:/ssl:ro + ports: + - 3306:3306 + dns: 192.168.3.2 + networks: + default: + ipv6_address: 2a01:e0a:5b7:35f1::3306 + restart: always + lumieredesoy-ghost: + image: ghost:5-alpine + volumes: + - lumieredesoy-ghost-data:/var/lib/ghost/content + - /srv/docker/volume/lumieredesoy_ghost/config/config.production.json:/var/lib/ghost/config.production.json:ro + env_file: env/lumieredesoy-ghost + restart: always pdns: image: pdns-alpine volumes: @@ -121,16 +143,7 @@ services: volumes: - /srv/docker/volume/grafana/grafana.ini:/etc/grafana/grafana.ini restart: always - mem_limit: 1G - php: - image: php83-alpine - extra_hosts: - - "mail.verry.org:192.168.42.3" - dns: 192.168.3.2 - command: php-fpm - volumes: - - /srv/www:/srv/www - restart: always + mem_limit: 128M loki: image: grafana/loki volumes: @@ -143,6 +156,34 @@ services: env_file: env/miniflux restart: always mem_limit: 128M + php: + image: php-alpine + extra_hosts: + - "mail.verry.org:192.168.42.3" + dns: 192.168.3.2 + volumes: + - /srv/www:/srv/www + restart: always + authentik-server: + image: ghcr.io/goauthentik/server:latest + restart: unless-stopped + command: server + volumes: + - /srv/docker/volume/authentik/media:/media + - /srv/docker/volume/authentik/custom-templates:/templates + env_file: + - env/authentik + authentik-worker: + image: ghcr.io/goauthentik/server:latest + restart: unless-stopped + command: worker + volumes: + - /srv/docker/volume/authentik/certs:/certs + - /srv/docker/volume/authentik/media:/media + - /srv/docker/volume/authentik/custom-templates:/templates + restart: unless-stopped + env_file: + - env/authentik pgbouncer: image: pgbouncer-alpine volumes: @@ -201,6 +242,11 @@ services: - "mail.verry.org:192.168.3.5" restart: always mem_limit: 128M + prometheus-mysqld: + image: prom/mysqld-exporter + env_file: env/prometheus-mysqld + restart: always + mem_limit: 512M prometheus-postgres: image: quay.io/prometheuscommunity/postgres-exporter env_file: env/prometheus-postgres @@ -278,14 +324,13 @@ services: restart: always environment: - WHOAMI_NAME=iamverry - linkding: - image: sissbruecker/linkding:latest + bitwarden: + image: vaultwarden/server volumes: - - /srv/docker/volume/linkding:/etc/linkding/data + - /srv/docker/volume/bitwarden:/data restart: always - mem_limit: 1G - env_file: env/linkding - command: uwsgi --http [::]:9090 uwsgi.ini + mem_limit: 128M + env_file: env/vaultwarden drone: image: drone/drone:2 restart: always @@ -294,22 +339,13 @@ services: image: drone/drone-runner-ssh restart: always env_file: env/drone-runner-ssh -# minio: -# image: minio/minio -# volumes: -# - /srv/docker/volume/minio/data:/data:rw -# env_file: env/minio -# restart: always -# command: minio server /data -# mem_limit: 1G -# cpus: 0.5 - matrixsyncv3: - image: alpine:3.18 - env_file: env/matrixsyncv3 + minio: + image: minio/minio volumes: - - /srv/docker/volume/sliding-sync/bin/syncv3:/bin/syncv3 + - /srv/docker/volume/minio/data:/data:rw + env_file: env/minio restart: always - command: /bin/syncv3 + command: minio server /data mem_limit: 1G cpus: 0.5 dendrite: @@ -334,8 +370,8 @@ services: volumes: - /srv/docker/volume/uptime-kuma/data:/app/data:rw restart: always - mem_limit: 2G - cpus: 1 + mem_limit: 1G + cpus: 0.5 vikunja-api: image: vikunja/api:latest env_file: env/vikunja-api @@ -350,6 +386,9 @@ services: restart: always mem_limit: 512M cpus: 0.5 + networks: + default: + ipv4_address: 172.20.0.42 geoipupdate: image: "maxmindinc/geoipupdate:latest" volumes: diff --git a/peach/reload.sh b/peach/reload.sh index f4c25ff..719cfed 100755 --- a/peach/reload.sh +++ b/peach/reload.sh @@ -3,5 +3,4 @@ cd "$(dirname "$0")" -docker-compose pull --ignore-pull-failures docker-compose up -d