Update docker-compose files to version 2025.2.1 and enforce required environment variables
This commit is contained in:
		
							parent
							
								
									9f3d79ba37
								
							
						
					
					
						commit
						1c5e397bbe
					
				
					 2 changed files with 20 additions and 16 deletions
				
			
		| 
						 | 
				
			
			@ -1,4 +1,6 @@
 | 
			
		|||
---
 | 
			
		||||
# Based on authentiks official docker-compose.yml
 | 
			
		||||
# Version: 2025.2.1
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  geoipupdate:
 | 
			
		||||
| 
						 | 
				
			
			@ -12,7 +14,7 @@ services:
 | 
			
		|||
      GEOIPUPDATE_LICENSE_KEY: "${GEOIPUPDATE_LICENSE_KEY:?MaxMind GeoIP license key required}"
 | 
			
		||||
 | 
			
		||||
  postgresql:
 | 
			
		||||
    image: docker.io/library/postgres:${POSTGRES_TAG:-16.6-alpine}
 | 
			
		||||
    image: docker.io/library/postgres:${POSTGRES_TAG:?POSTGRES_TAG is not configured}
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    healthcheck:
 | 
			
		||||
      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
 | 
			
		||||
| 
						 | 
				
			
			@ -33,7 +35,7 @@ services:
 | 
			
		|||
      - backend
 | 
			
		||||
 | 
			
		||||
  redis:
 | 
			
		||||
    image: docker.io/library/redis:${REDIS_TAG:-7.4.2-alpine}
 | 
			
		||||
    image: docker.io/library/redis:${REDIS_TAG:?REDIS_TAG is not configured}
 | 
			
		||||
    command: --save 60 1 --loglevel warning
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    healthcheck:
 | 
			
		||||
| 
						 | 
				
			
			@ -48,7 +50,7 @@ services:
 | 
			
		|||
      - backend
 | 
			
		||||
 | 
			
		||||
  server:
 | 
			
		||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.10.0}
 | 
			
		||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:?AUTHENTIK_TAG is not configured}
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    command: server
 | 
			
		||||
    environment:
 | 
			
		||||
| 
						 | 
				
			
			@ -73,7 +75,7 @@ services:
 | 
			
		|||
      - frontend
 | 
			
		||||
 | 
			
		||||
  worker:
 | 
			
		||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.10.0}
 | 
			
		||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:?AUTHENTIK_TAG is not configured}
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    command: worker
 | 
			
		||||
    environment:
 | 
			
		||||
| 
						 | 
				
			
			@ -110,7 +112,7 @@ services:
 | 
			
		|||
      context: ./docker/nginx
 | 
			
		||||
      dockerfile: Dockerfile
 | 
			
		||||
      args:
 | 
			
		||||
        IMAGE: "nginxinc/nginx-unprivileged:${NGINX_UNPRIVILEGED_TAG:-1.27.2-bookworm}"
 | 
			
		||||
        IMAGE: "nginxinc/nginx-unprivileged:${NGINX_UNPRIVILEGED_TAG:?NGINX_UNPRIVILEGED_TAG is not configured}"
 | 
			
		||||
        IMG_TITLE: "nginx-unprivileged-base23"
 | 
			
		||||
        IMAGE_VERSION: "COMPOSE"
 | 
			
		||||
    depends_on:
 | 
			
		||||
| 
						 | 
				
			
			@ -149,7 +151,7 @@ services:
 | 
			
		|||
      - frontend
 | 
			
		||||
 | 
			
		||||
  backup:
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:?RESTICKER_TAG is not configured}
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    environment:
 | 
			
		||||
      PRE_COMMANDS: |-
 | 
			
		||||
| 
						 | 
				
			
			@ -182,7 +184,7 @@ services:
 | 
			
		|||
      - ./data/.lego:/var/lib/lego/backups:ro
 | 
			
		||||
 | 
			
		||||
  prune-backup:
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:?RESTICKER_TAG is not configured}
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    environment:
 | 
			
		||||
      SKIP_INIT: "true"
 | 
			
		||||
| 
						 | 
				
			
			@ -196,7 +198,7 @@ services:
 | 
			
		|||
 | 
			
		||||
  # prüft ob backups noch in Ordnung sind, evtl. erweitern zum prüfen der Daten
 | 
			
		||||
  check-backup:
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:?RESTICKER_TAG is not configured}
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    environment:
 | 
			
		||||
      #RUN_ON_STARTUP: "true"
 | 
			
		||||
| 
						 | 
				
			
			@ -210,7 +212,7 @@ services:
 | 
			
		|||
      - ./data/restic/ssh/:/run/secrets/.ssh:ro
 | 
			
		||||
 | 
			
		||||
  restore-cli:
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:?RESTICKER_TAG is not configured}
 | 
			
		||||
    entrypoint: /entrypoint-restore
 | 
			
		||||
    environment:
 | 
			
		||||
      RESTIC_REPOSITORY: sftp://${RESTIC_REPO_USER:?Restic repository user is required}@${RESTIC_REPO_ADDRESS:?Restic repository address is requried}:${RESTIC_REPO_PORT:?Restic repository port is required}//backup
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,6 @@
 | 
			
		|||
---
 | 
			
		||||
# Based on authentiks official docker-compose.yml
 | 
			
		||||
# Version: 2025.2.1
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  geoipupdate:
 | 
			
		||||
| 
						 | 
				
			
			@ -12,7 +14,7 @@ services:
 | 
			
		|||
      GEOIPUPDATE_LICENSE_KEY: "${GEOIPUPDATE_LICENSE_KEY:?MaxMind GeoIP license key required}"
 | 
			
		||||
 | 
			
		||||
  postgresql:
 | 
			
		||||
    image: docker.io/library/postgres:${POSTGRES_TAG:-16.6-alpine}
 | 
			
		||||
    image: docker.io/library/postgres:${POSTGRES_TAG:?POSTGRES_TAG is not configured}
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    healthcheck:
 | 
			
		||||
      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
 | 
			
		||||
| 
						 | 
				
			
			@ -33,7 +35,7 @@ services:
 | 
			
		|||
      - backend
 | 
			
		||||
 | 
			
		||||
  redis:
 | 
			
		||||
    image: docker.io/library/redis:${REDIS_TAG:-7.4.2-alpine}
 | 
			
		||||
    image: docker.io/library/redis:${REDIS_TAG:?REDIS_TAG is not configured}
 | 
			
		||||
    command: --save 60 1 --loglevel warning
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    healthcheck:
 | 
			
		||||
| 
						 | 
				
			
			@ -48,7 +50,7 @@ services:
 | 
			
		|||
      - backend
 | 
			
		||||
 | 
			
		||||
  server:
 | 
			
		||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.2.0}
 | 
			
		||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:?AUTHENTIK_TAG is not configured}
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    command: server
 | 
			
		||||
    environment:
 | 
			
		||||
| 
						 | 
				
			
			@ -83,7 +85,7 @@ services:
 | 
			
		|||
      - "traefik.http.services.sso.loadbalancer.server.scheme=https"
 | 
			
		||||
 | 
			
		||||
  worker:
 | 
			
		||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.2.0}
 | 
			
		||||
    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:?AUTHENTIK_TAG is not configured}
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    command: worker
 | 
			
		||||
    environment:
 | 
			
		||||
| 
						 | 
				
			
			@ -116,7 +118,7 @@ services:
 | 
			
		|||
      - backend
 | 
			
		||||
 | 
			
		||||
  backup:
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:?RESTICKER_TAG is not configured}
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    environment:
 | 
			
		||||
      PRE_COMMANDS: |-
 | 
			
		||||
| 
						 | 
				
			
			@ -149,7 +151,7 @@ services:
 | 
			
		|||
      - ./data/.lego:/var/lib/lego/backups:ro
 | 
			
		||||
 | 
			
		||||
  prune-backup:
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:?RESTICKER_TAG is not configured}
 | 
			
		||||
    restart: unless-stopped
 | 
			
		||||
    environment:
 | 
			
		||||
      SKIP_INIT: "true"
 | 
			
		||||
| 
						 | 
				
			
			@ -162,7 +164,7 @@ services:
 | 
			
		|||
      - ./data/restic/ssh/:/run/secrets/.ssh:ro
 | 
			
		||||
 | 
			
		||||
  restore-cli:
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:-0.17.0}
 | 
			
		||||
    image: registry.git.base23.de/base23/backup/resticker:${RESTICKER_TAG:?RESTICKER_TAG is not configured}
 | 
			
		||||
    entrypoint: /entrypoint-restore
 | 
			
		||||
    environment:
 | 
			
		||||
      RESTIC_REPOSITORY: sftp://${RESTIC_REPO_USER:?Restic repository user is required}@${RESTIC_REPO_ADDRESS:?Restic repository address is requried}:${RESTIC_REPO_PORT:?Restic repository port is required}//backup
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue