Merge branch 'main' into renovate/ghcr.io-n8n-io-n8n-1.x
All checks were successful
Lint on PR / Lint YAML files (pull_request) Successful in 4s
All checks were successful
Lint on PR / Lint YAML files (pull_request) Successful in 4s
This commit is contained in:
commit
f52f553ecf
7 changed files with 29 additions and 29 deletions
|
@ -103,4 +103,3 @@ volumes:
|
||||||
ollama:
|
ollama:
|
||||||
external: true
|
external: true
|
||||||
open-webui:
|
open-webui:
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- gitea_main
|
- gitea_main
|
||||||
|
|
||||||
fail2ban:
|
fail2ban:
|
||||||
image: crazymax/fail2ban:1.1.0
|
image: crazymax/fail2ban:1.1.0
|
||||||
container_name: fail2ban
|
container_name: fail2ban
|
||||||
|
@ -204,7 +204,7 @@ services:
|
||||||
- 22000:22000/udp
|
- 22000:22000/udp
|
||||||
- 21027:21027/udp
|
- 21027:21027/udp
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
wiki-db:
|
wiki-db:
|
||||||
image: postgres:15-alpine
|
image: postgres:15-alpine
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -228,4 +228,4 @@ volumes:
|
||||||
driver_opts:
|
driver_opts:
|
||||||
type: nfs
|
type: nfs
|
||||||
o: addr=nas.lan,vers=4,rw
|
o: addr=nas.lan,vers=4,rw
|
||||||
device: ":/mnt/thePool/thePoolShare/Media"
|
device: ":/mnt/thePool/thePoolShare/Media"
|
||||||
|
|
|
@ -78,16 +78,16 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgresql
|
- postgresql
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
authentik_ldap:
|
authentik_ldap:
|
||||||
image: ghcr.io/goauthentik/ldap:2024.10.5
|
image: ghcr.io/goauthentik/ldap:2024.10.5
|
||||||
ports:
|
ports:
|
||||||
- 389:3389
|
- 389:3389
|
||||||
- 636:6636
|
- 636:6636
|
||||||
environment:
|
environment:
|
||||||
AUTHENTIK_HOST: ${AUTH_HOST}
|
AUTHENTIK_HOST: ${AUTH_HOST}
|
||||||
AUTHENTIK_INSECURE: "true"
|
AUTHENTIK_INSECURE: "true"
|
||||||
AUTHENTIK_TOKEN: ${AUTH_TOKEN}
|
AUTHENTIK_TOKEN: ${AUTH_TOKEN}
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
database:
|
database:
|
||||||
|
|
|
@ -32,7 +32,7 @@ services:
|
||||||
- GF_AUTH_GENERIC_OAUTH_API_URL=$AUTHENTIK_URL/application/o/userinfo/
|
- 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_SIGNOUT_REDIRECT_URL=$AUTHENTIK_URL/application/o/grafana/end-session/
|
||||||
- GF_AUTH_OAUTH_AUTO_LOGIN=false
|
- GF_AUTH_OAUTH_AUTO_LOGIN=false
|
||||||
- GF_SERVER_ROOT_URL=$GF_SERVER_ROOT_URL
|
- GF_SERVER_ROOT_URL=$GF_SERVER_ROOT_URL
|
||||||
user: "1000"
|
user: "1000"
|
||||||
volumes:
|
volumes:
|
||||||
- /docker/appdata/grafana:/var/lib/grafana
|
- /docker/appdata/grafana:/var/lib/grafana
|
||||||
|
@ -93,7 +93,7 @@ services:
|
||||||
- /:/host:ro,rslave
|
- /:/host:ro,rslave
|
||||||
networks:
|
networks:
|
||||||
- grafana
|
- grafana
|
||||||
|
|
||||||
cadvisor:
|
cadvisor:
|
||||||
image: gcr.io/cadvisor/cadvisor:v0.51.0
|
image: gcr.io/cadvisor/cadvisor:v0.51.0
|
||||||
container_name: cadvisor
|
container_name: cadvisor
|
||||||
|
@ -116,7 +116,7 @@ services:
|
||||||
command: ["sonarr"]
|
command: ["sonarr"]
|
||||||
environment:
|
environment:
|
||||||
PORT: 9707
|
PORT: 9707
|
||||||
URL: $SONARR_URL
|
URL: $SONARR_URL
|
||||||
APIKEY: $SONARR_API
|
APIKEY: $SONARR_API
|
||||||
ports:
|
ports:
|
||||||
- "9707:9707"
|
- "9707:9707"
|
||||||
|
@ -129,7 +129,7 @@ services:
|
||||||
command: ["radarr"]
|
command: ["radarr"]
|
||||||
environment:
|
environment:
|
||||||
PORT: 9708
|
PORT: 9708
|
||||||
URL: $RADARR_URL
|
URL: $RADARR_URL
|
||||||
APIKEY: $RADARR_API
|
APIKEY: $RADARR_API
|
||||||
ports:
|
ports:
|
||||||
- "9708:9708"
|
- "9708:9708"
|
||||||
|
@ -144,9 +144,9 @@ services:
|
||||||
PORT: 9710
|
PORT: 9710
|
||||||
URL: $PROWLARR_URL
|
URL: $PROWLARR_URL
|
||||||
APIKEY: $PROWLARR_API
|
APIKEY: $PROWLARR_API
|
||||||
PROWLARR__BACKFILL: true
|
PROWLARR__BACKFILL: true
|
||||||
ports:
|
ports:
|
||||||
- "9710:9710"
|
- "9710:9710"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- grafana
|
- grafana
|
||||||
|
@ -156,10 +156,10 @@ services:
|
||||||
command: ["sabnzbd"]
|
command: ["sabnzbd"]
|
||||||
environment:
|
environment:
|
||||||
PORT: 9711
|
PORT: 9711
|
||||||
URL: $SAB_URL
|
URL: $SAB_URL
|
||||||
APIKEY: $SAB_API
|
APIKEY: $SAB_API
|
||||||
ports:
|
ports:
|
||||||
- "9711:9711"
|
- "9711:9711"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- grafana
|
- grafana
|
||||||
|
@ -215,4 +215,4 @@ networks:
|
||||||
grafana:
|
grafana:
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
prom_data:
|
prom_data:
|
||||||
|
|
|
@ -57,7 +57,7 @@ services:
|
||||||
- 22000:22000/udp
|
- 22000:22000/udp
|
||||||
- 21027:21027/udp
|
- 21027:21027/udp
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
jellystat-db:
|
jellystat-db:
|
||||||
image: postgres:15.2
|
image: postgres:15.2
|
||||||
environment:
|
environment:
|
||||||
|
@ -65,7 +65,8 @@ services:
|
||||||
POSTGRES_USER: postgres
|
POSTGRES_USER: postgres
|
||||||
POSTGRES_PASSWORD: $POSTGRES_PASSWORD
|
POSTGRES_PASSWORD: $POSTGRES_PASSWORD
|
||||||
volumes:
|
volumes:
|
||||||
- /docker/appdata/jellystat/postgres-data:/var/lib/postgresql/data
|
- /docker/appdata/jellystat/postgres-data:/var/lib/postgresql/data
|
||||||
|
|
||||||
jellystat:
|
jellystat:
|
||||||
image: cyfershepard/jellystat:1.1.1
|
image: cyfershepard/jellystat:1.1.1
|
||||||
environment:
|
environment:
|
||||||
|
@ -75,7 +76,7 @@ services:
|
||||||
POSTGRES_PORT: 5432
|
POSTGRES_PORT: 5432
|
||||||
JWT_SECRET: $JWT_SECRET
|
JWT_SECRET: $JWT_SECRET
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
volumes:
|
volumes:
|
||||||
- /docker/appdata/jellystat/backup-data:/app/backend/backup-data
|
- /docker/appdata/jellystat/backup-data:/app/backend/backup-data
|
||||||
depends_on:
|
depends_on:
|
||||||
|
@ -88,4 +89,4 @@ volumes:
|
||||||
driver_opts:
|
driver_opts:
|
||||||
type: nfs
|
type: nfs
|
||||||
o: addr=nas.lan,vers=4,rw
|
o: addr=nas.lan,vers=4,rw
|
||||||
device: ":/mnt/thePool/thePoolShare/Media"
|
device: ":/mnt/thePool/thePoolShare/Media"
|
||||||
|
|
|
@ -11,7 +11,7 @@ services:
|
||||||
- /docker/appdata/nginx/data:/data
|
- /docker/appdata/nginx/data:/data
|
||||||
- /docker/appdata/nginx/letsencrypt:/etc/letsencrypt
|
- /docker/appdata/nginx/letsencrypt:/etc/letsencrypt
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
fail2ban:
|
fail2ban:
|
||||||
image: crazymax/fail2ban:1.1.0
|
image: crazymax/fail2ban:1.1.0
|
||||||
container_name: fail2ban_docker-pi
|
container_name: fail2ban_docker-pi
|
||||||
|
@ -35,7 +35,7 @@ services:
|
||||||
- SSMTP_PASSWORD=$SSMTP_PASSWORD
|
- SSMTP_PASSWORD=$SSMTP_PASSWORD
|
||||||
- SSMTP_TLS=YES
|
- SSMTP_TLS=YES
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
cf-tunnel:
|
cf-tunnel:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
image: cloudflare/cloudflared@sha256:055932e8581b57a65f08f6232762d000a8ec6e0709fe783b47090490457f9091
|
image: cloudflare/cloudflared@sha256:055932e8581b57a65f08f6232762d000a8ec6e0709fe783b47090490457f9091
|
||||||
|
@ -52,4 +52,4 @@ services:
|
||||||
- TWINGATE_LABEL_HOSTNAME=${HOSTNAME}
|
- TWINGATE_LABEL_HOSTNAME=${HOSTNAME}
|
||||||
- TWINGATE_LABEL_DEPLOYED_BY=docker
|
- TWINGATE_LABEL_DEPLOYED_BY=docker
|
||||||
sysctls:
|
sysctls:
|
||||||
- net.ipv4.ping_group_range=0 2147483647
|
- net.ipv4.ping_group_range=0 2147483647
|
||||||
|
|
Loading…
Reference in a new issue