diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index ae700c2..e7aef09 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -3,8 +3,6 @@ version: "3.9" volumes: ssl: external: true - lumieredesoy-ghost-data: - external: true victoria-metrics: external: true haproxy-socket: @@ -82,6 +80,7 @@ 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 @@ -97,13 +96,6 @@ services: networks: default: ipv6_address: 2a01:e0a:5b7:35f1::6379 - 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: @@ -129,7 +121,7 @@ services: volumes: - /srv/docker/volume/grafana/grafana.ini:/etc/grafana/grafana.ini restart: always - mem_limit: 128M + mem_limit: 1G loki: image: grafana/loki volumes: @@ -158,7 +150,7 @@ services: - /srv/docker/volume/authentik/media:/media - /srv/docker/volume/authentik/custom-templates:/templates env_file: - - env/authentik + - env/authentik-server authentik-worker: image: ghcr.io/goauthentik/server:latest command: worker @@ -168,7 +160,7 @@ services: - /srv/docker/volume/authentik/custom-templates:/templates restart: unless-stopped env_file: - - env/authentik + - env/authentik-worker pgbouncer: image: pgbouncer-alpine volumes: @@ -304,13 +296,6 @@ services: restart: always environment: - WHOAMI_NAME=iamverry - bitwarden: - image: vaultwarden/server - volumes: - - /srv/docker/volume/bitwarden:/data - restart: always - mem_limit: 128M - env_file: env/vaultwarden linkding: image: sissbruecker/linkding:latest volumes: @@ -327,13 +312,22 @@ services: image: drone/drone-runner-ssh restart: always env_file: env/drone-runner-ssh - minio: - image: minio/minio +# 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 volumes: - - /srv/docker/volume/minio/data:/data:rw - env_file: env/minio + - /srv/docker/volume/sliding-sync/bin/syncv3:/bin/syncv3 restart: always - command: minio server /data + command: /bin/syncv3 mem_limit: 1G cpus: 0.5 dendrite: @@ -347,12 +341,6 @@ services: restart: always mem_limit: 1G cpus: 0.5 - wikijs: - image: ghcr.io/requarks/wiki:2 - env_file: env/wikijs - restart: always - mem_limit: 1G - cpus: 0.5 matrix-alertmanager: image: jaywink/matrix-alertmanager:latest env_file: env/matrix-alertmanager @@ -364,8 +352,8 @@ services: volumes: - /srv/docker/volume/uptime-kuma/data:/app/data:rw restart: always - mem_limit: 1G - cpus: 0.5 + mem_limit: 2G + cpus: 1 vikunja-api: image: vikunja/api:latest env_file: env/vikunja-api