Merge branch 'main' into renovate/ghcr.io-n8n-io-n8n-1.x

Author: Matt Reeves

docker/AI/docker-compose.yml

@@ -103,4 +103,3 @@ volumes:
   ollama:
     external: true
   open-webui:
-    

docker/arm/docker-compose.yml

@@ -65,7 +65,7 @@ services:
     restart: unless-stopped
     networks:
       - gitea_main
-  
+
   fail2ban:
     image: crazymax/fail2ban:1.1.0
     container_name: fail2ban
@@ -204,7 +204,7 @@ services:
       - 22000:22000/udp
       - 21027:21027/udp
     restart: unless-stopped
-  
+
   wiki-db:
     image: postgres:15-alpine
     environment:

docker/arrs/docker-compose.yml

@@ -228,4 +228,4 @@ volumes:
     driver_opts:
       type: nfs
       o: addr=nas.lan,vers=4,rw
-      device: ":/mnt/thePool/thePoolShare/Media"
+      device: ":/mnt/thePool/thePoolShare/Media"

docker/authentik/docker-compose.yml

@@ -78,16 +78,16 @@ services:
     depends_on:
       - postgresql
       - redis
-  
+
   authentik_ldap:
-        image: ghcr.io/goauthentik/ldap:2024.10.5
-        ports:
-            - 389:3389
-            - 636:6636
-        environment:
-            AUTHENTIK_HOST: ${AUTH_HOST}
-            AUTHENTIK_INSECURE: "true"
-            AUTHENTIK_TOKEN: ${AUTH_TOKEN}
+    image: ghcr.io/goauthentik/ldap:2024.10.5
+    ports:
+      - 389:3389
+      - 636:6636
+    environment:
+      AUTHENTIK_HOST: ${AUTH_HOST}
+      AUTHENTIK_INSECURE: "true"
+      AUTHENTIK_TOKEN: ${AUTH_TOKEN}
 
 volumes:
   database:

docker/grafana/docker-compose.yml

@@ -32,7 +32,7 @@ services:
       - GF_AUTH_GENERIC_OAUTH_API_URL=$AUTHENTIK_URL/application/o/userinfo/
       - GF_AUTH_SIGNOUT_REDIRECT_URL=$AUTHENTIK_URL/application/o/grafana/end-session/
       - GF_AUTH_OAUTH_AUTO_LOGIN=false
-      - GF_SERVER_ROOT_URL=$GF_SERVER_ROOT_URL 
+      - GF_SERVER_ROOT_URL=$GF_SERVER_ROOT_URL
     user: "1000"
     volumes:
       - /docker/appdata/grafana:/var/lib/grafana
@@ -93,7 +93,7 @@ services:
       - /:/host:ro,rslave
     networks:
       - grafana
-  
+
   cadvisor:
     image: gcr.io/cadvisor/cadvisor:v0.51.0
     container_name: cadvisor
@@ -116,7 +116,7 @@ services:
     command: ["sonarr"]
     environment:
       PORT: 9707
-      URL: $SONARR_URL 
+      URL: $SONARR_URL
       APIKEY: $SONARR_API
     ports:
       - "9707:9707"
@@ -129,7 +129,7 @@ services:
     command: ["radarr"]
     environment:
       PORT: 9708
-      URL: $RADARR_URL 
+      URL: $RADARR_URL
       APIKEY: $RADARR_API
     ports:
       - "9708:9708"
@@ -144,9 +144,9 @@ services:
       PORT: 9710
       URL: $PROWLARR_URL
       APIKEY: $PROWLARR_API
-      PROWLARR__BACKFILL: true 
+      PROWLARR__BACKFILL: true
     ports:
-     - "9710:9710"
+      - "9710:9710"
     restart: unless-stopped
     networks:
       - grafana
@@ -156,10 +156,10 @@ services:
     command: ["sabnzbd"]
     environment:
       PORT: 9711
-      URL: $SAB_URL 
+      URL: $SAB_URL
       APIKEY: $SAB_API
     ports:
-     - "9711:9711"
+      - "9711:9711"
     restart: unless-stopped
     networks:
       - grafana
@@ -215,4 +215,4 @@ networks:
   grafana:
 
 volumes:
-  prom_data:
+  prom_data:

docker/jellyfin/docker-compose.yml

@@ -57,15 +57,16 @@ services:
       - 22000:22000/udp
       - 21027:21027/udp
     restart: unless-stopped
-  
+
   jellystat-db:
     image: postgres:15.2
     environment:
       POSTGRES_DB: 'jfstat'
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: $POSTGRES_PASSWORD
     volumes:
-    - /docker/appdata/jellystat/postgres-data:/var/lib/postgresql/data
+      - /docker/appdata/jellystat/postgres-data:/var/lib/postgresql/data
+
   jellystat:
     image: cyfershepard/jellystat:1.1.1
     environment:
@@ -75,7 +76,7 @@ services:
       POSTGRES_PORT: 5432
       JWT_SECRET: $JWT_SECRET
     ports:
-      - "3000:3000" 
+      - "3000:3000"
     volumes:
       - /docker/appdata/jellystat/backup-data:/app/backend/backup-data
     depends_on:
@@ -88,4 +89,4 @@ volumes:
     driver_opts:
       type: nfs
       o: addr=nas.lan,vers=4,rw
-      device: ":/mnt/thePool/thePoolShare/Media"
+      device: ":/mnt/thePool/thePoolShare/Media"

docker/npm/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - /docker/appdata/nginx/data:/data
       - /docker/appdata/nginx/letsencrypt:/etc/letsencrypt
     restart: unless-stopped
-  
+
   fail2ban:
     image: crazymax/fail2ban:1.1.0
     container_name: fail2ban_docker-pi
@@ -35,7 +35,7 @@ services:
       - SSMTP_PASSWORD=$SSMTP_PASSWORD
       - SSMTP_TLS=YES
     restart: always
-  
+
   cf-tunnel:
     restart: unless-stopped
     image: cloudflare/cloudflared@sha256:055932e8581b57a65f08f6232762d000a8ec6e0709fe783b47090490457f9091
@@ -52,4 +52,4 @@ services:
       - TWINGATE_LABEL_HOSTNAME=${HOSTNAME}
       - TWINGATE_LABEL_DEPLOYED_BY=docker
     sysctls:
-      - net.ipv4.ping_group_range=0 2147483647
+      - net.ipv4.ping_group_range=0 2147483647