Compare commits

..

No commits in common. "223d08086f9dbecc1c08d500b5ab1be883a026d4" and "abf4eb0876ab1f5a1ec9f6761417277e4219d9b2" have entirely different histories.

2 changed files with 75 additions and 37 deletions

View file

@ -3,6 +3,10 @@ version: "3.9"
volumes: volumes:
ssl: ssl:
external: true external: true
mariadb-data:
external: true
lumieredesoy-ghost-data:
external: true
victoria-metrics: victoria-metrics:
external: true external: true
haproxy-socket: haproxy-socket:
@ -48,9 +52,9 @@ services:
ipv6_address: 2a01:e0a:5b7:35f1::5432 ipv6_address: 2a01:e0a:5b7:35f1::5432
restart: always restart: always
haproxy: haproxy:
image: haproxytech/haproxy-alpine-quic:2.8 image: haproxy:alpine
volumes: volumes:
- ssl:/ssl:rw - ssl:/ssl:ro
- /etc/haproxy:/usr/local/etc/haproxy:ro - /etc/haproxy:/usr/local/etc/haproxy:ro
- /etc/haproxy:/etc/haproxy:ro - /etc/haproxy:/etc/haproxy:ro
- haproxy-socket:/var/lib/haproxy:rw - haproxy-socket:/var/lib/haproxy:rw
@ -59,7 +63,7 @@ services:
- 443:443/udp - 443:443/udp
- 80:80 - 80:80
restart: always restart: always
mem_limit: 512M mem_limit: 128M
dns: fd00::3:2 dns: fd00::3:2
networks: networks:
default: default:
@ -80,7 +84,6 @@ services:
- ssl:/etc/dehydrated:ro - ssl:/etc/dehydrated:ro
- /etc/caddy:/etc/caddy - /etc/caddy:/etc/caddy
- /srv/www:/srv/www - /srv/www:/srv/www
- /srv/www/nfs/kiwi/Videos:/srv/www/nfs/kiwi/Videos:ro
restart: always restart: always
mem_limit: 128M mem_limit: 128M
dns: 192.168.3.2 dns: 192.168.3.2
@ -96,6 +99,25 @@ services:
networks: networks:
default: default:
ipv6_address: 2a01:e0a:5b7:35f1::6379 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: pdns:
image: pdns-alpine image: pdns-alpine
volumes: volumes:
@ -121,16 +143,7 @@ services:
volumes: volumes:
- /srv/docker/volume/grafana/grafana.ini:/etc/grafana/grafana.ini - /srv/docker/volume/grafana/grafana.ini:/etc/grafana/grafana.ini
restart: always restart: always
mem_limit: 1G mem_limit: 128M
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: loki:
image: grafana/loki image: grafana/loki
volumes: volumes:
@ -143,6 +156,34 @@ services:
env_file: env/miniflux env_file: env/miniflux
restart: always restart: always
mem_limit: 128M 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: pgbouncer:
image: pgbouncer-alpine image: pgbouncer-alpine
volumes: volumes:
@ -201,6 +242,11 @@ services:
- "mail.verry.org:192.168.3.5" - "mail.verry.org:192.168.3.5"
restart: always restart: always
mem_limit: 128M mem_limit: 128M
prometheus-mysqld:
image: prom/mysqld-exporter
env_file: env/prometheus-mysqld
restart: always
mem_limit: 512M
prometheus-postgres: prometheus-postgres:
image: quay.io/prometheuscommunity/postgres-exporter image: quay.io/prometheuscommunity/postgres-exporter
env_file: env/prometheus-postgres env_file: env/prometheus-postgres
@ -278,14 +324,13 @@ services:
restart: always restart: always
environment: environment:
- WHOAMI_NAME=iamverry - WHOAMI_NAME=iamverry
linkding: bitwarden:
image: sissbruecker/linkding:latest image: vaultwarden/server
volumes: volumes:
- /srv/docker/volume/linkding:/etc/linkding/data - /srv/docker/volume/bitwarden:/data
restart: always restart: always
mem_limit: 1G mem_limit: 128M
env_file: env/linkding env_file: env/vaultwarden
command: uwsgi --http [::]:9090 uwsgi.ini
drone: drone:
image: drone/drone:2 image: drone/drone:2
restart: always restart: always
@ -294,22 +339,13 @@ services:
image: drone/drone-runner-ssh image: drone/drone-runner-ssh
restart: always restart: always
env_file: env/drone-runner-ssh env_file: env/drone-runner-ssh
# minio: minio:
# image: 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: volumes:
- /srv/docker/volume/sliding-sync/bin/syncv3:/bin/syncv3 - /srv/docker/volume/minio/data:/data:rw
env_file: env/minio
restart: always restart: always
command: /bin/syncv3 command: minio server /data
mem_limit: 1G mem_limit: 1G
cpus: 0.5 cpus: 0.5
dendrite: dendrite:
@ -334,8 +370,8 @@ services:
volumes: volumes:
- /srv/docker/volume/uptime-kuma/data:/app/data:rw - /srv/docker/volume/uptime-kuma/data:/app/data:rw
restart: always restart: always
mem_limit: 2G mem_limit: 1G
cpus: 1 cpus: 0.5
vikunja-api: vikunja-api:
image: vikunja/api:latest image: vikunja/api:latest
env_file: env/vikunja-api env_file: env/vikunja-api
@ -350,6 +386,9 @@ services:
restart: always restart: always
mem_limit: 512M mem_limit: 512M
cpus: 0.5 cpus: 0.5
networks:
default:
ipv4_address: 172.20.0.42
geoipupdate: geoipupdate:
image: "maxmindinc/geoipupdate:latest" image: "maxmindinc/geoipupdate:latest"
volumes: volumes:

View file

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