Merge branch 'main' into renovate/ghcr.io-goauthentik-server
This commit is contained in:
commit
4754987662
11 changed files with 90 additions and 32 deletions
|
@ -2,7 +2,7 @@ version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
ollama:
|
ollama:
|
||||||
image: docker.mafyuh.xyz/ollama/ollama:0.1.45
|
image: docker.mafyuh.xyz/ollama/ollama:0.1.48
|
||||||
container_name: ollama
|
container_name: ollama
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -18,7 +18,7 @@ services:
|
||||||
capabilities: [gpu]
|
capabilities: [gpu]
|
||||||
|
|
||||||
open-webui:
|
open-webui:
|
||||||
image: ghcr.io/open-webui/open-webui:0.3.5
|
image: ghcr.io/open-webui/open-webui:0.3.7
|
||||||
container_name: open-webui
|
container_name: open-webui
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
|
@ -29,7 +29,7 @@ services:
|
||||||
- host.docker.internal:host-gateway
|
- host.docker.internal:host-gateway
|
||||||
|
|
||||||
mindsdb:
|
mindsdb:
|
||||||
image: docker.mafyuh.xyz/mindsdb/mindsdb:v24.6.3.1
|
image: docker.mafyuh.xyz/mindsdb/mindsdb:v24.7.1.0
|
||||||
container_name: mindsdb
|
container_name: mindsdb
|
||||||
ports:
|
ports:
|
||||||
- 47334:47334
|
- 47334:47334
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
adguardhome:
|
adguardhome:
|
||||||
image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.51
|
image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.52
|
||||||
container_name: adguardhome
|
container_name: adguardhome
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
adguardhome:
|
adguardhome:
|
||||||
image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.51
|
image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.52
|
||||||
container_name: adguardhome
|
container_name: adguardhome
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -22,7 +22,7 @@ services:
|
||||||
- 5443:5443/udp
|
- 5443:5443/udp
|
||||||
|
|
||||||
adguardhome-sync:
|
adguardhome-sync:
|
||||||
image: ghcr.io/linuxserver/adguardhome-sync@sha256:67962a0e15bf1a41e4bc0083d93d7e0268ad6431482c337ef49d5f2673c36c71
|
image: ghcr.io/linuxserver/adguardhome-sync@sha256:eb34df4da9480993a7e63f600541c5c6f3462dbabe8a67780cf58740957526fe
|
||||||
container_name: adguardhome-sync
|
container_name: adguardhome-sync
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
server:
|
server:
|
||||||
image: codeberg.org/forgejo/forgejo:7.0.4
|
image: codeberg.org/forgejo/forgejo:7.0.5
|
||||||
container_name: forgejo
|
container_name: forgejo
|
||||||
environment:
|
environment:
|
||||||
- USER_UID=1000
|
- USER_UID=1000
|
||||||
|
@ -53,7 +53,7 @@ services:
|
||||||
- gitea_main
|
- gitea_main
|
||||||
|
|
||||||
nginx-proxy-manager:
|
nginx-proxy-manager:
|
||||||
image: docker.mafyuh.xyz/jc21/nginx-proxy-manager:2.11.2
|
image: docker.mafyuh.xyz/jc21/nginx-proxy-manager:2.11.3
|
||||||
container_name: nginx-proxy-manager
|
container_name: nginx-proxy-manager
|
||||||
ports:
|
ports:
|
||||||
- 80:80
|
- 80:80
|
||||||
|
@ -107,7 +107,7 @@ services:
|
||||||
networks:
|
networks:
|
||||||
- gitea_main
|
- gitea_main
|
||||||
n8n:
|
n8n:
|
||||||
image: ghcr.io/n8n-io/n8n:1.47.0
|
image: ghcr.io/n8n-io/n8n:1.48.2
|
||||||
container_name: n8n
|
container_name: n8n
|
||||||
ports:
|
ports:
|
||||||
- 5678:5678
|
- 5678:5678
|
||||||
|
@ -137,7 +137,7 @@ services:
|
||||||
ipv4_address: 172.25.0.25
|
ipv4_address: 172.25.0.25
|
||||||
|
|
||||||
syncthing:
|
syncthing:
|
||||||
image: ghcr.io/linuxserver/syncthing@sha256:6e70dd0cc0ddb038a8f58cf0945d6659b13c984f11d708407469bf16d520574c
|
image: ghcr.io/linuxserver/syncthing@sha256:bc97605a1d7d07ca221a05949ea0f56a0585feb5db375b756b1f2bca0354600f
|
||||||
container_name: syncthing
|
container_name: syncthing
|
||||||
hostname: ARM #optional
|
hostname: ARM #optional
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
bazarr:
|
bazarr:
|
||||||
image: ghcr.io/linuxserver/bazarr@sha256:6fb83511c0dca70a400fde79cb45ed59c4f66ea30dcba8c6f9274f01d77e5aef
|
image: ghcr.io/linuxserver/bazarr@sha256:86ad012fc31e974dcf0147900a202443d92d12f4334a9e4ec89baa2052fb12fa
|
||||||
container_name: bazarr
|
container_name: bazarr
|
||||||
ports:
|
ports:
|
||||||
- "6767:6767"
|
- "6767:6767"
|
||||||
|
@ -15,7 +15,7 @@ services:
|
||||||
- PGID=1000
|
- PGID=1000
|
||||||
|
|
||||||
lidarr:
|
lidarr:
|
||||||
image: ghcr.io/linuxserver/lidarr@sha256:a7d0282dcdbf5b11306cc4054c11b42252106b5e8494375231322822d31ac9f6
|
image: ghcr.io/linuxserver/lidarr@sha256:1c051955d5a564e67dab3711be1b9407acd988fd72e2a7d271255d41f6b818ea
|
||||||
container_name: lidarr
|
container_name: lidarr
|
||||||
ports:
|
ports:
|
||||||
- "8686:8686"
|
- "8686:8686"
|
||||||
|
@ -31,7 +31,7 @@ services:
|
||||||
- PGID=1000
|
- PGID=1000
|
||||||
|
|
||||||
prowlarr:
|
prowlarr:
|
||||||
image: ghcr.io/linuxserver/prowlarr@sha256:3061e68afda543202ee7382cbfe3bfa94a1ab7d03ebaa242c732ffe2f73088f0
|
image: ghcr.io/linuxserver/prowlarr@sha256:211cfc5b99e14dee7d49190b6ac8cceee3183a58240d522fb1937847ee4518e4
|
||||||
container_name: prowlarr
|
container_name: prowlarr
|
||||||
ports:
|
ports:
|
||||||
- "9696:9696"
|
- "9696:9696"
|
||||||
|
@ -43,7 +43,7 @@ services:
|
||||||
- PGID=1000
|
- PGID=1000
|
||||||
|
|
||||||
radarr:
|
radarr:
|
||||||
image: ghcr.io/linuxserver/radarr@sha256:3e64efcc14f9b21b30e78c39203e754d1d1a897d0f76ffb92450cd5c8ae16c9a
|
image: ghcr.io/linuxserver/radarr@sha256:c5b78b1f1e8556d781788194c4ee2b87ca7e3620b701bfce31499e60ee50eca3
|
||||||
container_name: radarr
|
container_name: radarr
|
||||||
ports:
|
ports:
|
||||||
- "7878:7878"
|
- "7878:7878"
|
||||||
|
@ -57,7 +57,7 @@ services:
|
||||||
- PGID=1000
|
- PGID=1000
|
||||||
|
|
||||||
sonarr:
|
sonarr:
|
||||||
image: ghcr.io/linuxserver/sonarr@sha256:275467ba17d990bbc6301dec3cc76b042969836749de39067818759d0f3b407f
|
image: ghcr.io/linuxserver/sonarr@sha256:3f193d343c1225676c1ea0547c5022fd83c4459a493870179dff9e87c54dbbc9
|
||||||
container_name: sonarr
|
container_name: sonarr
|
||||||
ports:
|
ports:
|
||||||
- "8989:8989"
|
- "8989:8989"
|
||||||
|
@ -91,7 +91,7 @@ services:
|
||||||
- AUTH_OIDC_ADMIN_GROUP=${AUTH_OIDC_ADMIN_GROUP}
|
- AUTH_OIDC_ADMIN_GROUP=${AUTH_OIDC_ADMIN_GROUP}
|
||||||
|
|
||||||
doplarr:
|
doplarr:
|
||||||
image: ghcr.io/linuxserver/doplarr@sha256:d621ebd24dd6296a6aefe2772c7c0ad6429bc5a4c93b32326816bf27758750c9
|
image: ghcr.io/linuxserver/doplarr@sha256:b71ea85a718b4ed924f132c6a5e62ddef68a7f43ba137f4f30900067532a5d9a
|
||||||
container_name: doplarr
|
container_name: doplarr
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
|
@ -140,7 +140,7 @@ services:
|
||||||
image: gcr.io/cadvisor/cadvisor:v0.49.1
|
image: gcr.io/cadvisor/cadvisor:v0.49.1
|
||||||
|
|
||||||
syncthing:
|
syncthing:
|
||||||
image: ghcr.io/linuxserver/syncthing@sha256:6e70dd0cc0ddb038a8f58cf0945d6659b13c984f11d708407469bf16d520574c
|
image: ghcr.io/linuxserver/syncthing@sha256:bc97605a1d7d07ca221a05949ea0f56a0585feb5db375b756b1f2bca0354600f
|
||||||
container_name: syncthing
|
container_name: syncthing
|
||||||
hostname: ARRS
|
hostname: ARRS
|
||||||
environment:
|
environment:
|
||||||
|
@ -157,6 +157,21 @@ services:
|
||||||
- 21027:21027/udp
|
- 21027:21027/udp
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
code-server:
|
||||||
|
image: ghcr.io/linuxserver/code-server@sha256:086c9625a89bec4ea651cea26ee5ec7c242fe3d318fdc9142fd89b091bae04e6
|
||||||
|
container_name: code-server
|
||||||
|
environment:
|
||||||
|
- PUID=1000
|
||||||
|
- PGID=1000
|
||||||
|
- TZ=Etc/UTC
|
||||||
|
- SUDO_PASSWORD=$SUDO_PASSWORD
|
||||||
|
- PROXY_DOMAIN=$PROXY_DOMAIN
|
||||||
|
volumes:
|
||||||
|
- /docker/appdata/code-server/config:/config
|
||||||
|
ports:
|
||||||
|
- 8443:8443
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
default:
|
default:
|
||||||
name: arrs_default
|
name: arrs_default
|
||||||
|
|
|
@ -3,7 +3,7 @@ version: "3.4"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
postgresql:
|
postgresql:
|
||||||
image: docker.io/library/postgres:12-alpine
|
image: docker.io/library/postgres:16-alpine
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
|
test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
|
||||||
|
@ -79,15 +79,6 @@ services:
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgresql
|
- postgresql
|
||||||
- redis
|
- redis
|
||||||
authentik_ldap:
|
|
||||||
image: ghcr.io/goauthentik/ldap@sha256:7f317da9b736dec3e53b71b7face1787d4f15aee00e80d003e5ff3b2d49ee382
|
|
||||||
ports:
|
|
||||||
- 389:3389
|
|
||||||
- 636:6636
|
|
||||||
environment:
|
|
||||||
AUTHENTIK_HOST: ${AUTH_HOST}
|
|
||||||
AUTHENTIK_INSECURE: "true"
|
|
||||||
AUTHENTIK_TOKEN: ${AUTH_TOKEN}
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
database:
|
database:
|
||||||
|
|
26
docker-runner/docker-compose.yml
Normal file
26
docker-runner/docker-compose.yml
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
---
|
||||||
|
services:
|
||||||
|
docker-in-docker:
|
||||||
|
image: docker:dind
|
||||||
|
container_name: 'docker_dind'
|
||||||
|
privileged: 'true'
|
||||||
|
command: ['dockerd', '-H', 'tcp://0.0.0.0:2375', '--tls=false']
|
||||||
|
restart: 'unless-stopped'
|
||||||
|
|
||||||
|
gitea:
|
||||||
|
image: 'code.forgejo.org/forgejo/runner:3.5.0'
|
||||||
|
links:
|
||||||
|
- docker-in-docker
|
||||||
|
depends_on:
|
||||||
|
docker-in-docker:
|
||||||
|
condition: service_started
|
||||||
|
container_name: 'runner'
|
||||||
|
environment:
|
||||||
|
DOCKER_HOST: tcp://docker-in-docker:2375
|
||||||
|
# User without root privileges, but with access to `/data`.
|
||||||
|
user: 1000:1000
|
||||||
|
volumes:
|
||||||
|
- /home/mafyuh/data:/data
|
||||||
|
restart: 'unless-stopped'
|
||||||
|
|
||||||
|
command: '/bin/sh -c "sleep 5; forgejo-runner daemon"'
|
|
@ -1,7 +1,7 @@
|
||||||
version: '3.9'
|
version: '3.9'
|
||||||
services:
|
services:
|
||||||
sabnzbd:
|
sabnzbd:
|
||||||
image: ghcr.io/linuxserver/sabnzbd@sha256:4fb40ea724abc25cf9496cdbc8e528aa0882132737e49c5e712c264284fa7b94
|
image: ghcr.io/linuxserver/sabnzbd@sha256:db76abdcd65ba2c06a630d17d7e71e75245f8c7ace734d4cadd6402e2776ad5c
|
||||||
container_name: sabnzbd
|
container_name: sabnzbd
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
|
@ -32,7 +32,7 @@ services:
|
||||||
- VPN_USER=mafyuh+pmp
|
- VPN_USER=mafyuh+pmp
|
||||||
- VPN_PASS=
|
- VPN_PASS=
|
||||||
- STRICT_PORT_FORWARD=yes
|
- STRICT_PORT_FORWARD=yes
|
||||||
- LAN_NETWORK=10.0.0.0/24,10.69.69.0/24
|
- LAN_NETWORK=$LAN_NETWORK
|
||||||
- ENABLE_PRIVOXY=yes
|
- ENABLE_PRIVOXY=yes
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
- PGID=1000
|
- PGID=1000
|
||||||
|
@ -48,7 +48,7 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
flaresolverr:
|
flaresolverr:
|
||||||
image: ghcr.io/flaresolverr/flaresolverr:v3.3.20
|
image: ghcr.io/flaresolverr/flaresolverr:v3.3.21
|
||||||
container_name: flaresolverr
|
container_name: flaresolverr
|
||||||
ports:
|
ports:
|
||||||
- '8191:8191'
|
- '8191:8191'
|
||||||
|
|
|
@ -34,7 +34,7 @@ services:
|
||||||
privileged: true
|
privileged: true
|
||||||
|
|
||||||
syncthing:
|
syncthing:
|
||||||
image: ghcr.io/linuxserver/syncthing@sha256:6e70dd0cc0ddb038a8f58cf0945d6659b13c984f11d708407469bf16d520574c
|
image: ghcr.io/linuxserver/syncthing@sha256:bc97605a1d7d07ca221a05949ea0f56a0585feb5db375b756b1f2bca0354600f
|
||||||
container_name: syncthing
|
container_name: syncthing
|
||||||
hostname: JF
|
hostname: JF
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
netbootxyz:
|
netbootxyz:
|
||||||
image: ghcr.io/linuxserver/netbootxyz@sha256:dce6b2c729611f1090f2e6479b764d98aef24cc340d018d923fa6678fcbf330e
|
image: ghcr.io/linuxserver/netbootxyz@sha256:f1d0a90e7b677bcafcf3791aae86e52e2d8a307920f475581b5afe4b96e24641
|
||||||
container_name: netboot
|
container_name: netboot
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
|
|
26
runner/docker-compose.yml
Normal file
26
runner/docker-compose.yml
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
---
|
||||||
|
services:
|
||||||
|
docker-in-docker:
|
||||||
|
image: docker:dind
|
||||||
|
container_name: 'docker_dind'
|
||||||
|
privileged: 'true'
|
||||||
|
command: ['dockerd', '-H', 'tcp://0.0.0.0:2375', '--tls=false']
|
||||||
|
restart: 'unless-stopped'
|
||||||
|
|
||||||
|
gitea:
|
||||||
|
image: 'code.forgejo.org/forgejo/runner:3.5.0'
|
||||||
|
links:
|
||||||
|
- docker-in-docker
|
||||||
|
depends_on:
|
||||||
|
docker-in-docker:
|
||||||
|
condition: service_started
|
||||||
|
container_name: 'runner'
|
||||||
|
environment:
|
||||||
|
DOCKER_HOST: tcp://docker-in-docker:2375
|
||||||
|
# User without root privileges, but with access to `/data`.
|
||||||
|
user: 1000:1000
|
||||||
|
volumes:
|
||||||
|
- /home/mafyuh/data:/data
|
||||||
|
restart: 'unless-stopped'
|
||||||
|
|
||||||
|
command: '/bin/sh -c "sleep 5; forgejo-runner daemon"'
|
Reference in a new issue