From 223d08086f9dbecc1c08d500b5ab1be883a026d4 Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Tue, 9 Jan 2024 11:57:45 +0100 Subject: [PATCH] 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