Refactor Docker Compose configuration for authentik services: improve healthcheck syntax, add labels, and standardize image tags.

This commit is contained in:
Peter Wood
2025-06-17 09:20:58 -04:00
parent fe0e4a3056
commit ea4b41ddba

View File

@@ -2,8 +2,12 @@ services:
postgresql: postgresql:
image: docker.io/library/postgres:16-alpine image: docker.io/library/postgres:16-alpine
restart: unless-stopped restart: unless-stopped
labels:
- diun.enable=true
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -d $${PG_DB} -U $${PG_USER}"] test:
- CMD-SHELL
- pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}
start_period: 20s start_period: 20s
interval: 30s interval: 30s
retries: 5 retries: 5
@@ -14,15 +18,18 @@ services:
POSTGRES_PASSWORD: ${PG_PASS:?database password required} POSTGRES_PASSWORD: ${PG_PASS:?database password required}
POSTGRES_USER: ${PG_USER:-authentik} POSTGRES_USER: ${PG_USER:-authentik}
POSTGRES_DB: ${PG_DB:-authentik} POSTGRES_DB: ${PG_DB:-authentik}
POSTGRES_PORT: ${PG_PORT:-5432}
env_file: env_file:
- .env - .env
redis: redis:
image: docker.io/library/redis:alpine image: docker.io/library/redis:alpine
command: --save 60 1 --loglevel warning command: --save 60 1 --loglevel warning
restart: unless-stopped restart: unless-stopped
labels:
- diun.enable=true
healthcheck: healthcheck:
test: ["CMD-SHELL", "redis-cli ping | grep PONG"] test:
- CMD-SHELL
- redis-cli ping | grep PONG
start_period: 20s start_period: 20s
interval: 30s interval: 30s
retries: 5 retries: 5
@@ -30,10 +37,13 @@ services:
volumes: volumes:
- redis:/data - redis:/data
server: server:
image: ghcr.io/goauthentik/server:2025.2.0 image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-latest}
restart: unless-stopped restart: unless-stopped
command: server command: server
labels:
- diun.enable=true
environment: environment:
AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
AUTHENTIK_REDIS__HOST: redis AUTHENTIK_REDIS__HOST: redis
AUTHENTIK_POSTGRESQL__HOST: postgresql AUTHENTIK_POSTGRESQL__HOST: postgresql
AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
@@ -45,18 +55,21 @@ services:
env_file: env_file:
- .env - .env
ports: ports:
- "${COMPOSE_PORT_HTTP:-9000}:9000" - ${COMPOSE_PORT_HTTP:-9000}:9000
- "${COMPOSE_PORT_HTTPS:-9443}:9443" - ${COMPOSE_PORT_HTTPS:-9443}:9443
depends_on: depends_on:
postgresql: postgresql:
condition: service_healthy condition: service_healthy
redis: redis:
condition: service_healthy condition: service_healthy
worker: worker:
image: ghcr.io/goauthentik/server:2025.2.0 image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.4.0}
restart: unless-stopped restart: unless-stopped
command: worker command: worker
labels:
- diun.enable=true
environment: environment:
AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
AUTHENTIK_REDIS__HOST: redis AUTHENTIK_REDIS__HOST: redis
AUTHENTIK_POSTGRESQL__HOST: postgresql AUTHENTIK_POSTGRESQL__HOST: postgresql
AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
@@ -81,9 +94,9 @@ services:
condition: service_healthy condition: service_healthy
redis: redis:
condition: service_healthy condition: service_healthy
volumes: volumes:
database: database:
driver: local driver: local
redis: redis:
driver: local driver: local
networks: {}