From baa28bf66cb40069cca9561d19d85e300ae6ff98 Mon Sep 17 00:00:00 2001
From: furyhawk <furyx@hotmail.com>
Date: Sun, 12 Apr 2026 20:35:23 +0800
Subject: [PATCH] fix: update authentik configuration for PostgreSQL connection
 and volume paths

---
 swarm/apps.yml      |  4 +--
 swarm/authentik.yml |  8 +++---
 test/compose.yml    | 67 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 test/compose.yml

diff --git a/swarm/apps.yml b/swarm/apps.yml
index 8c76d6c..c739a38 100644
--- a/swarm/apps.yml
+++ b/swarm/apps.yml
@@ -31,8 +31,8 @@ services:
     volumes:
       - /var/data/adminer_data:/var/lib/pgadmin
     restart: unless-stopped
-    depends_on:
-      - postgres_db
+    # depends_on:
+    #   - postgres_db
     networks:
       - traefik-public
     deploy:
diff --git a/swarm/authentik.yml b/swarm/authentik.yml
index 5719d0f..cb1cf77 100644
--- a/swarm/authentik.yml
+++ b/swarm/authentik.yml
@@ -54,13 +54,13 @@ services:
     command: server
     environment:
       AUTHENTIK_REDIS__HOST: tasks.redis
-      AUTHENTIK_POSTGRESQL__HOST: 192.168.50.220
+      AUTHENTIK_POSTGRESQL__HOST: 192.168.50.220:5432
       AUTHENTIK_POSTGRESQL__USER: ${POSTGRES_USER:-authentik}
       AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
       AUTHENTIK_POSTGRESQL__PASSWORD: ${POSTGRES_PASSWORD}
-      AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY}
+      AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
     volumes:
-      - /var/data/authentik/media:/media
+      - /var/data/authentik/media:/data
       - /var/data/authentik/custom-templates:/templates
     # env_file:
     #   - .env
@@ -106,7 +106,7 @@ services:
     # user: root
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /var/data/authentik/media:/media
+      - /var/data/authentik/media:/data
       - /var/data/authentik/certs:/certs
       - /var/data/authentik/custom-templates:/templates
     # env_file:
diff --git a/test/compose.yml b/test/compose.yml
new file mode 100644
index 0000000..a350a7f
--- /dev/null
+++ b/test/compose.yml
@@ -0,0 +1,67 @@
+services:
+  postgresql:
+    env_file:
+    - .env
+    environment:
+      POSTGRES_DB: ${PG_DB:-authentik}
+      POSTGRES_PASSWORD: ${PG_PASS:?database password required}
+      POSTGRES_USER: ${PG_USER:-authentik}
+    healthcheck:
+      interval: 30s
+      retries: 5
+      start_period: 20s
+      test:
+      - CMD-SHELL
+      - pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}
+      timeout: 5s
+    image: docker.io/library/postgres:16-alpine
+    restart: unless-stopped
+    volumes:
+    - database:/var/lib/postgresql/data
+  server:
+    command: server
+    depends_on:
+      postgresql:
+        condition: service_healthy
+    env_file:
+    - .env
+    environment:
+      AUTHENTIK_POSTGRESQL__HOST: postgresql
+      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
+      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
+      AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
+      AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2026.2.2}
+    ports:
+    - ${COMPOSE_PORT_HTTP:-9000}:9000
+    - ${COMPOSE_PORT_HTTPS:-9443}:9443
+    restart: unless-stopped
+    shm_size: 512mb
+    volumes:
+    - ./data:/data
+    - ./custom-templates:/templates
+  worker:
+    command: worker
+    depends_on:
+      postgresql:
+        condition: service_healthy
+    env_file:
+    - .env
+    environment:
+      AUTHENTIK_POSTGRESQL__HOST: postgresql
+      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
+      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
+      AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
+      AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2026.2.2}
+    restart: unless-stopped
+    shm_size: 512mb
+    user: root
+    volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+    - ./data:/data
+    - ./certs:/certs
+    - ./custom-templates:/templates
+volumes:
+  database:
+    driver: local