From 4e01a93d1cfce331d3455f1f85785c95bd720c55 Mon Sep 17 00:00:00 2001
From: Teck Meng <furyx@hotmail.com>
Date: Fri, 13 Sep 2024 15:36:02 +0800
Subject: [PATCH] Refactor authentik.yml to update network name and remove root
 user from worker service

---
 swarm/authentik.yml | 48 ++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/swarm/authentik.yml b/swarm/authentik.yml
index 83dfe10..9fbd490 100644
--- a/swarm/authentik.yml
+++ b/swarm/authentik.yml
@@ -1,8 +1,8 @@
 ---
 
 volumes:
-  database:
-    driver: local
+  # database:
+  #   driver: local
   redis:
     driver: local
 
@@ -14,26 +14,26 @@ networks:
     external: true
 
 services:
-  postgresql:
-    image: docker.io/library/postgres:16-alpine
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
-      start_period: 20s
-      interval: 30s
-      retries: 5
-      timeout: 5s
-    volumes:
-      - database:/var/lib/postgresql/data
-    environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?database password required}
-      POSTGRES_USER: ${POSTGRES_USER:-authentik}
-      POSTGRES_DB: ${PG_DB:-authentik}
-      AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
-    # env_file:
-    #   - .env
-    networks:
-      - authentik
+  # postgresql:
+  #   image: docker.io/library/postgres:16-alpine
+  #   restart: unless-stopped
+  #   healthcheck:
+  #     test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
+  #     start_period: 20s
+  #     interval: 30s
+  #     retries: 5
+  #     timeout: 5s
+  #   volumes:
+  #     - database:/var/lib/postgresql/data
+  #   environment:
+  #     POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?database password required}
+  #     POSTGRES_USER: ${POSTGRES_USER:-authentik}
+  #     POSTGRES_DB: ${PG_DB:-authentik}
+  #     AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
+  #   # env_file:
+  #   #   - .env
+  #   networks:
+  #     - authentik
   redis:
     image: docker.io/library/redis:alpine
     command: --save 60 1 --loglevel warning
@@ -54,7 +54,7 @@ services:
     command: server
     environment:
       AUTHENTIK_REDIS__HOST: redis
-      AUTHENTIK_POSTGRESQL__HOST: postgresql
+      AUTHENTIK_POSTGRESQL__HOST: ${DATABASE__HOSTNAME:-postgresql}
       AUTHENTIK_POSTGRESQL__USER: ${POSTGRES_USER:-authentik}
       AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
       AUTHENTIK_POSTGRESQL__PASSWORD: ${POSTGRES_PASSWORD}
@@ -92,7 +92,7 @@ services:
     command: worker
     environment:
       AUTHENTIK_REDIS__HOST: redis
-      AUTHENTIK_POSTGRESQL__HOST: postgresql
+      AUTHENTIK_POSTGRESQL__HOST: ${DATABASE__HOSTNAME:-postgresql}
       AUTHENTIK_POSTGRESQL__USER: ${POSTGRES_USER:-authentik}
       AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
       AUTHENTIK_POSTGRESQL__PASSWORD: ${POSTGRES_PASSWORD}