diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index e0c93c7..1a8eb29 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -9,8 +9,12 @@ volumes: external: true victoria-metrics: external: true + haproxy-socket: + external: true postgres-13: external: true + postgres-15: + external: true networks: default: @@ -36,11 +40,13 @@ services: - 389:389 restart: always postgres: - image: postgres:13-alpine + image: postgres:15-alpine volumes: - - postgres-13:/var/lib/postgresql/data + - postgres-15:/var/lib/postgresql/data - ssl:/ssl:ro dns: fd00::3:2 + environment: + - POSTGRES_PASSWORD=J5PdCv9ObVh5uZCJDpndzXoUumAKn52K networks: default: ipv6_address: 2a01:e0a:5b7:35f1::5432 @@ -51,6 +57,7 @@ services: - ssl:/ssl:ro - /etc/haproxy:/usr/local/etc/haproxy:ro - /etc/haproxy:/etc/haproxy:ro + - haproxy-socket:/var/lib/haproxy:rw ports: - 443:443 - 443:443/udp @@ -61,6 +68,16 @@ services: networks: default: ipv6_address: 2a01:e0a:5b7:35f1::443 + vault: + image: hashicorp/vault + volumes: + - /srv/docker/volume/vault:/vault + restart: always + mem_limit: 128M + dns: 192.168.3.2 + cap_add: + - IPC_LOCK + command: vault server -config /vault/config caddy: image: caddy:alpine volumes: @@ -124,7 +141,7 @@ services: grafana: image: grafana/grafana volumes: - - /srv/docker/volume/grafana.ini:/etc/grafana/grafana.ini + - /srv/docker/volume/grafana/grafana.ini:/etc/grafana/grafana.ini restart: always mem_limit: 128M loki: @@ -139,18 +156,39 @@ services: env_file: env/miniflux restart: always mem_limit: 128M - php80: + php: image: php-alpine extra_hosts: - - "mail.verry.org:192.168.3.5" + - "mail.verry.org:192.168.42.3" + dns: 192.168.3.2 volumes: - /srv/www:/srv/www restart: always - dns: 192.168.3.2 + 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: - /srv/docker/volume/pgbouncer:/etc/pgbouncer:ro + dns: 192.168.3.2 restart: always mem_limit: 128M vmalert: @@ -170,7 +208,7 @@ services: - "ns2.vpn6:fd00::42:2" - "ns3.vpn6:fd00::42:3" - "backup-01.dinoutoo.vpn6:fd00::42:9" - - "unbound-exporter:fd00::3:2" + - "unbound-exporter:192.168.3.2" - "quichante.vpn6:fd00::42:4" - "click.vpn6:fd00::42:6" - "quizz.vpn6:fd00::42:8" @@ -327,6 +365,13 @@ services: restart: always mem_limit: 1G cpus: 0.5 + uptime-kuma: + image: louislam/uptime-kuma + volumes: + - /srv/docker/volume/uptime-kuma/data:/app/data:rw + restart: always + mem_limit: 1G + cpus: 0.5 vikunja-api: image: vikunja/api:latest env_file: env/vikunja-api @@ -339,7 +384,7 @@ services: image: vikunja/frontend env_file: env/vikunja-frontend restart: always - mem_limit: 1G + mem_limit: 512M cpus: 0.5 networks: default: diff --git a/peach/update.sh b/peach/update.sh index 8f21d4e..d1ebd5d 100755 --- a/peach/update.sh +++ b/peach/update.sh @@ -8,4 +8,4 @@ docker-compose pull --ignore-pull-failures docker-compose up -d # upgrade miniflux -./upgrade_miniflux.sh +#./upgrade_miniflux.sh