fix: update PostgreSQL and Authentik tags in env.prod.template for consistency
refactor: remove unused volumes from postgresql service in docker-compose files
This commit is contained in:
		
							parent
							
								
									bbf3f08be5
								
							
						
					
					
						commit
						70e68a2ed1
					
				
					 3 changed files with 63 additions and 70 deletions
				
			
		| 
						 | 
					@ -13,8 +13,6 @@ services:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  postgresql:
 | 
					  postgresql:
 | 
				
			||||||
    image: docker.io/library/postgres:${POSTGRES_TAG:?POSTGRES_TAG is not configured}
 | 
					    image: docker.io/library/postgres:${POSTGRES_TAG:?POSTGRES_TAG is not configured}
 | 
				
			||||||
    volumes:
 | 
					 | 
				
			||||||
      - database:/var/lib/postgresql/data
 | 
					 | 
				
			||||||
    networks:
 | 
					    networks:
 | 
				
			||||||
      - backend
 | 
					      - backend
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,90 +1,85 @@
 | 
				
			||||||
---
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  postgresql:
 | 
					  postgresql:
 | 
				
			||||||
    image: docker.io/library/postgres:16-alpine
 | 
					    env_file:
 | 
				
			||||||
    restart: unless-stopped
 | 
					    - .env
 | 
				
			||||||
    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:
 | 
					    environment:
 | 
				
			||||||
 | 
					      POSTGRES_DB: ${PG_DB:-authentik}
 | 
				
			||||||
      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}
 | 
					 | 
				
			||||||
    env_file:
 | 
					 | 
				
			||||||
      - .env
 | 
					 | 
				
			||||||
  redis:
 | 
					 | 
				
			||||||
    image: docker.io/library/redis:alpine
 | 
					 | 
				
			||||||
    command: --save 60 1 --loglevel warning
 | 
					 | 
				
			||||||
    restart: unless-stopped
 | 
					 | 
				
			||||||
    healthcheck:
 | 
					    healthcheck:
 | 
				
			||||||
      test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
 | 
					 | 
				
			||||||
      start_period: 20s
 | 
					 | 
				
			||||||
      interval: 30s
 | 
					      interval: 30s
 | 
				
			||||||
      retries: 5
 | 
					      retries: 5
 | 
				
			||||||
      timeout: 3s
 | 
					      start_period: 20s
 | 
				
			||||||
    volumes:
 | 
					      test:
 | 
				
			||||||
      - redis:/data
 | 
					      - CMD-SHELL
 | 
				
			||||||
  server:
 | 
					      - pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}
 | 
				
			||||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.4.2}
 | 
					      timeout: 5s
 | 
				
			||||||
 | 
					    image: docker.io/library/postgres:16-alpine
 | 
				
			||||||
    restart: unless-stopped
 | 
					    restart: unless-stopped
 | 
				
			||||||
    command: server
 | 
					 | 
				
			||||||
    environment:
 | 
					 | 
				
			||||||
      AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
 | 
					 | 
				
			||||||
      AUTHENTIK_REDIS__HOST: redis
 | 
					 | 
				
			||||||
      AUTHENTIK_POSTGRESQL__HOST: postgresql
 | 
					 | 
				
			||||||
      AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
 | 
					 | 
				
			||||||
      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
 | 
					 | 
				
			||||||
      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
 | 
					 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - ./media:/media
 | 
					    - database:/var/lib/postgresql/data
 | 
				
			||||||
      - ./custom-templates:/templates
 | 
					  redis:
 | 
				
			||||||
    env_file:
 | 
					    command: --save 60 1 --loglevel warning
 | 
				
			||||||
      - .env
 | 
					    healthcheck:
 | 
				
			||||||
    ports:
 | 
					      interval: 30s
 | 
				
			||||||
      - "${COMPOSE_PORT_HTTP:-9000}:9000"
 | 
					      retries: 5
 | 
				
			||||||
      - "${COMPOSE_PORT_HTTPS:-9443}:9443"
 | 
					      start_period: 20s
 | 
				
			||||||
 | 
					      test:
 | 
				
			||||||
 | 
					      - CMD-SHELL
 | 
				
			||||||
 | 
					      - redis-cli ping | grep PONG
 | 
				
			||||||
 | 
					      timeout: 3s
 | 
				
			||||||
 | 
					    image: docker.io/library/redis:alpine
 | 
				
			||||||
 | 
					    restart: unless-stopped
 | 
				
			||||||
 | 
					    volumes:
 | 
				
			||||||
 | 
					    - redis:/data
 | 
				
			||||||
 | 
					  server:
 | 
				
			||||||
 | 
					    command: server
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
      postgresql:
 | 
					      postgresql:
 | 
				
			||||||
        condition: service_healthy
 | 
					        condition: service_healthy
 | 
				
			||||||
      redis:
 | 
					      redis:
 | 
				
			||||||
        condition: service_healthy
 | 
					        condition: service_healthy
 | 
				
			||||||
  worker:
 | 
					    env_file:
 | 
				
			||||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.4.2}
 | 
					    - .env
 | 
				
			||||||
    restart: unless-stopped
 | 
					 | 
				
			||||||
    command: worker
 | 
					 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
 | 
					 | 
				
			||||||
      AUTHENTIK_REDIS__HOST: redis
 | 
					 | 
				
			||||||
      AUTHENTIK_POSTGRESQL__HOST: postgresql
 | 
					      AUTHENTIK_POSTGRESQL__HOST: postgresql
 | 
				
			||||||
      AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
 | 
					 | 
				
			||||||
      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
 | 
					      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
 | 
				
			||||||
      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
 | 
					      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
 | 
				
			||||||
    # `user: root` and the docker socket volume are optional.
 | 
					      AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
 | 
				
			||||||
    # See more for the docker socket integration here:
 | 
					      AUTHENTIK_REDIS__HOST: redis
 | 
				
			||||||
    # https://goauthentik.io/docs/outposts/integrations/docker
 | 
					      AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
 | 
				
			||||||
    # Removing `user: root` also prevents the worker from fixing the permissions
 | 
					    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.8.1}
 | 
				
			||||||
    # on the mounted folders, so when removing this make sure the folders have the correct UID/GID
 | 
					    ports:
 | 
				
			||||||
    # (1000:1000 by default)
 | 
					    - ${COMPOSE_PORT_HTTP:-9000}:9000
 | 
				
			||||||
 | 
					    - ${COMPOSE_PORT_HTTPS:-9443}:9443
 | 
				
			||||||
 | 
					    restart: unless-stopped
 | 
				
			||||||
 | 
					    volumes:
 | 
				
			||||||
 | 
					    - ./media:/media
 | 
				
			||||||
 | 
					    - ./custom-templates:/templates
 | 
				
			||||||
 | 
					  worker:
 | 
				
			||||||
 | 
					    command: worker
 | 
				
			||||||
 | 
					    depends_on:
 | 
				
			||||||
 | 
					      postgresql:
 | 
				
			||||||
 | 
					        condition: service_healthy
 | 
				
			||||||
 | 
					      redis:
 | 
				
			||||||
 | 
					        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_REDIS__HOST: redis
 | 
				
			||||||
 | 
					      AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
 | 
				
			||||||
 | 
					    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.8.1}
 | 
				
			||||||
 | 
					    restart: unless-stopped
 | 
				
			||||||
    user: root
 | 
					    user: root
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - /var/run/docker.sock:/var/run/docker.sock
 | 
					    - /var/run/docker.sock:/var/run/docker.sock
 | 
				
			||||||
      - ./media:/media
 | 
					    - ./media:/media
 | 
				
			||||||
      - ./certs:/certs
 | 
					    - ./certs:/certs
 | 
				
			||||||
      - ./custom-templates:/templates
 | 
					    - ./custom-templates:/templates
 | 
				
			||||||
    env_file:
 | 
					 | 
				
			||||||
      - .env
 | 
					 | 
				
			||||||
    depends_on:
 | 
					 | 
				
			||||||
      postgresql:
 | 
					 | 
				
			||||||
        condition: service_healthy
 | 
					 | 
				
			||||||
      redis:
 | 
					 | 
				
			||||||
        condition: service_healthy
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
volumes:
 | 
					volumes:
 | 
				
			||||||
  database:
 | 
					  database:
 | 
				
			||||||
    driver: local
 | 
					    driver: local
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,8 +5,8 @@ PUBLIC_DOMAIN=sso.s1q.dev
 | 
				
			||||||
TLS_DOMAIN=*.s1q.dev
 | 
					TLS_DOMAIN=*.s1q.dev
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Server Versions
 | 
					# Server Versions
 | 
				
			||||||
AUTHENTIK_TAG=2025.4.2
 | 
					AUTHENTIK_TAG=2025.8.1
 | 
				
			||||||
POSTGRES_TAG=16.9-alpine
 | 
					POSTGRES_TAG=17.6-alpine
 | 
				
			||||||
REDIS_TAG=8.0-alpine
 | 
					REDIS_TAG=8.0-alpine
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Error reporting & Logging
 | 
					# Error reporting & Logging
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue