From 049e4a76a2da3f3f109d5f2e1a47baa58725990c Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Mon, 1 May 2023 20:33:41 +0200 Subject: [PATCH 1/5] php82 --- peach/docker-compose.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index 1a8eb29..dc3659e 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -63,7 +63,7 @@ services: - 443:443/udp - 80:80 restart: always - mem_limit: 128M + mem_limit: 512M dns: fd00::3:2 networks: default: @@ -157,7 +157,7 @@ services: restart: always mem_limit: 128M php: - image: php-alpine + image: php82-alpine extra_hosts: - "mail.verry.org:192.168.42.3" dns: 192.168.3.2 @@ -175,7 +175,6 @@ services: - env/authentik authentik-worker: image: ghcr.io/goauthentik/server:latest - restart: unless-stopped command: worker volumes: - /srv/docker/volume/authentik/certs:/certs From 49d4f4727a01c61d6898c8a0bde4c8cc3dc43d2b Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Sat, 1 Jul 2023 09:48:56 +0200 Subject: [PATCH 2/5] haproxy --- peach/docker-compose.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index dc3659e..a11c471 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -52,9 +52,9 @@ services: ipv6_address: 2a01:e0a:5b7:35f1::5432 restart: always haproxy: - image: haproxy:alpine + image: haproxytech/haproxy-alpine-quic:2.8 volumes: - - ssl:/ssl:ro + - ssl:/ssl:rw - /etc/haproxy:/usr/local/etc/haproxy:ro - /etc/haproxy:/etc/haproxy:ro - haproxy-socket:/var/lib/haproxy:rw @@ -330,6 +330,14 @@ services: restart: always mem_limit: 128M env_file: env/vaultwarden + linkding: + image: sissbruecker/linkding:latest + volumes: + - /srv/docker/volume/linkding:/etc/linkding/data + restart: always + mem_limit: 1G + env_file: env/linkding + command: uwsgi --http [::]:9090 uwsgi.ini drone: image: drone/drone:2 restart: always @@ -358,6 +366,12 @@ 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 @@ -385,9 +399,6 @@ services: restart: always mem_limit: 512M cpus: 0.5 - networks: - default: - ipv4_address: 172.20.0.42 geoipupdate: image: "maxmindinc/geoipupdate:latest" volumes: From 9e629ea6121cfd476fc24f7ee38a4c807f0e4f93 Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Sat, 15 Jul 2023 22:33:10 +0200 Subject: [PATCH 3/5] remove mysql --- peach/docker-compose.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index a11c471..ae700c2 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -3,8 +3,6 @@ version: "3.9" volumes: ssl: external: true - mariadb-data: - external: true lumieredesoy-ghost-data: external: true victoria-metrics: @@ -99,18 +97,6 @@ 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: @@ -241,11 +227,6 @@ 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 From cbf0de0a98618a7639245fb66b353667dc888a0f Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Mon, 20 Nov 2023 20:27:58 +0100 Subject: [PATCH 4/5] 20231120 --- peach/docker-compose.yml | 52 ++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 32 deletions(-) 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 From 223d08086f9dbecc1c08d500b5ab1be883a026d4 Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Tue, 9 Jan 2024 11:57:45 +0100 Subject: [PATCH 5/5] remove authentik, upgrade to php8.3 --- peach/docker-compose.yml | 36 +++++++++--------------------------- peach/reload.sh | 1 + 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index e7aef09..99432af 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -122,6 +122,15 @@ services: - /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 loki: image: grafana/loki volumes: @@ -134,33 +143,6 @@ services: env_file: env/miniflux restart: always mem_limit: 128M - php: - image: php82-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-server - authentik-worker: - image: ghcr.io/goauthentik/server:latest - 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-worker pgbouncer: image: pgbouncer-alpine volumes: diff --git a/peach/reload.sh b/peach/reload.sh index 719cfed..f4c25ff 100755 --- a/peach/reload.sh +++ b/peach/reload.sh @@ -3,4 +3,5 @@ cd "$(dirname "$0")" +docker-compose pull --ignore-pull-failures docker-compose up -d