Merge branch 'main' into renovate/bellamy-wallos-2.x
This commit is contained in:
commit
ee51d81bac
9 changed files with 40 additions and 73 deletions
|
@ -2,7 +2,7 @@ version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
ollama:
|
ollama:
|
||||||
image: ollama/ollama:0.3.6
|
image: ollama/ollama:0.3.10
|
||||||
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.15
|
image: ghcr.io/open-webui/open-webui:0.3.21
|
||||||
container_name: open-webui
|
container_name: open-webui
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
server:
|
server:
|
||||||
image: codeberg.org/forgejo/forgejo:8.0.2
|
image: codeberg.org/forgejo/forgejo:8.0.3
|
||||||
container_name: forgejo
|
container_name: forgejo
|
||||||
environment:
|
environment:
|
||||||
- USER_UID=1000
|
- USER_UID=1000
|
||||||
|
@ -69,6 +69,8 @@ services:
|
||||||
uptime-kuma:
|
uptime-kuma:
|
||||||
image: louislam/uptime-kuma:1.23.13
|
image: louislam/uptime-kuma:1.23.13
|
||||||
container_name: uptime-kuma
|
container_name: uptime-kuma
|
||||||
|
environment:
|
||||||
|
- UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN=true
|
||||||
ports:
|
ports:
|
||||||
- 3001:3001
|
- 3001:3001
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -107,7 +109,7 @@ services:
|
||||||
networks:
|
networks:
|
||||||
- gitea_main
|
- gitea_main
|
||||||
n8n:
|
n8n:
|
||||||
image: ghcr.io/n8n-io/n8n:1.57.0
|
image: ghcr.io/n8n-io/n8n:1.58.1
|
||||||
container_name: n8n
|
container_name: n8n
|
||||||
ports:
|
ports:
|
||||||
- 5678:5678
|
- 5678:5678
|
||||||
|
|
|
@ -43,7 +43,7 @@ services:
|
||||||
- PGID=1000
|
- PGID=1000
|
||||||
|
|
||||||
radarr:
|
radarr:
|
||||||
image: ghcr.io/linuxserver/radarr@sha256:47acec85a0d92d107096088aebe83d1d0a434def34e5bac317fff18ca28741ae
|
image: ghcr.io/linuxserver/radarr@sha256:5ab12592e768d04d94bc04877bee194f372ea3946abc6de689311f4d8559ee2f
|
||||||
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:879f5f35b05566f71296bad0f3704709103568a6b4f42f5959543f5322728723
|
image: ghcr.io/linuxserver/sonarr@sha256:138998077a802c18b76c26636301fcd5517b7bfaf75db025d457199176078a12
|
||||||
container_name: sonarr
|
container_name: sonarr
|
||||||
ports:
|
ports:
|
||||||
- "8989:8989"
|
- "8989:8989"
|
||||||
|
@ -78,6 +78,7 @@ services:
|
||||||
- /docker/appdata/homarr/configs:/app/data/configs
|
- /docker/appdata/homarr/configs:/app/data/configs
|
||||||
- /docker/appdata/homarr/icons:/app/public/icons
|
- /docker/appdata/homarr/icons:/app/public/icons
|
||||||
- /docker/appdata/homarr/data:/data
|
- /docker/appdata/homarr/data:/data
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
ports:
|
ports:
|
||||||
- '7575:7575'
|
- '7575:7575'
|
||||||
environment:
|
environment:
|
||||||
|
@ -90,8 +91,21 @@ services:
|
||||||
- NEXTAUTH_URL=${NEXTAUTH_URL}
|
- NEXTAUTH_URL=${NEXTAUTH_URL}
|
||||||
- AUTH_OIDC_ADMIN_GROUP=${AUTH_OIDC_ADMIN_GROUP}
|
- AUTH_OIDC_ADMIN_GROUP=${AUTH_OIDC_ADMIN_GROUP}
|
||||||
|
|
||||||
|
homarr-iframes:
|
||||||
|
image: ghcr.io/diogovalentte/homarr-iframes:v0.1.19
|
||||||
|
container_name: homarr-iframes
|
||||||
|
ports:
|
||||||
|
- "8081:8080"
|
||||||
|
environment:
|
||||||
|
- VIKUNJA_TOKEN=$VIKUNJA_TOKEN
|
||||||
|
- INTERNAL_VIKUNJA_ADDRESS=$INTERNAL_VIKUNJA_ADDRESS
|
||||||
|
- VIKUNJA_ADDRESS=$VIKUNJA_ADDRESS
|
||||||
|
- UPTIMEKUMA_ADDRESS=$UPTIMEKUMA_ADDRESS
|
||||||
|
- TZ=$TZ
|
||||||
|
|
||||||
|
|
||||||
doplarr:
|
doplarr:
|
||||||
image: ghcr.io/linuxserver/doplarr@sha256:85c50e8af09ce227b2c121e1e7d4d9d0ff7f943beea024a9b4e5f3e9ad14a06c
|
image: ghcr.io/linuxserver/doplarr@sha256:8c46c09457f5b14859dbc26958a6ff665df34bd189d3c9b959861d9fdbc8bc52
|
||||||
container_name: doplarr
|
container_name: doplarr
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
|
@ -115,29 +129,15 @@ services:
|
||||||
- /docker/appdata/doplarr/config:/config
|
- /docker/appdata/doplarr/config:/config
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
jfa-go:
|
pinchflat:
|
||||||
image: hrfee/jfa-go
|
image: ghcr.io/kieraneglin/pinchflat@sha256:16dca569fa5f890f60d3b04f0cd25d2af7ccd960ad635ae8ba1e514619df189f
|
||||||
container_name: jfa-go
|
environment:
|
||||||
|
- TZ=America/New_York
|
||||||
ports:
|
ports:
|
||||||
- 8056:8056
|
- "8945:8945"
|
||||||
volumes:
|
volumes:
|
||||||
- /docker/appdata/jfa-go/config:/data
|
- /docker/appdata/pinchflat/config:/config
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /data/media/Youtube/downloads:/downloads
|
||||||
|
|
||||||
cadvisor:
|
|
||||||
volumes:
|
|
||||||
- /:/rootfs:ro
|
|
||||||
- /var/run:/var/run:ro
|
|
||||||
- /sys:/sys:ro
|
|
||||||
- /var/lib/docker/:/var/lib/docker:ro
|
|
||||||
- /dev/disk/:/dev/disk:ro
|
|
||||||
ports:
|
|
||||||
- 9999:8080
|
|
||||||
container_name: cadvisor
|
|
||||||
privileged: true
|
|
||||||
devices:
|
|
||||||
- /dev/kmsg
|
|
||||||
image: gcr.io/cadvisor/cadvisor:v0.50.0
|
|
||||||
|
|
||||||
syncthing:
|
syncthing:
|
||||||
image: ghcr.io/linuxserver/syncthing@sha256:d5481de808a1de5a13b814a922b1f6de5fcde64c1ca95b0a065218b56570fae3
|
image: ghcr.io/linuxserver/syncthing@sha256:d5481de808a1de5a13b814a922b1f6de5fcde64c1ca95b0a065218b56570fae3
|
||||||
|
@ -157,21 +157,6 @@ services:
|
||||||
- 21027:21027/udp
|
- 21027:21027/udp
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
code-server:
|
|
||||||
image: ghcr.io/linuxserver/code-server@sha256:71a3e3fba62f01a82f04a3f38b7ebe45f0d44dab63bc17ef279cf62af2c217cb
|
|
||||||
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
|
||||||
|
|
|
@ -32,7 +32,7 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- redis:/data
|
- redis:/data
|
||||||
server:
|
server:
|
||||||
image: ghcr.io/goauthentik/server@sha256:ec5683345b6283214e01112dd4ba4ac7af1fc638a6e2301e6c18b7f3036f27bc
|
image: ghcr.io/goauthentik/server@sha256:5823497f0dade4976c7804a8612005db65b59c71e2c1f2903e3716b02db4a82c
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: server
|
command: server
|
||||||
environment:
|
environment:
|
||||||
|
@ -53,7 +53,7 @@ services:
|
||||||
- postgresql
|
- postgresql
|
||||||
- redis
|
- redis
|
||||||
worker:
|
worker:
|
||||||
image: ghcr.io/goauthentik/server@sha256:ec5683345b6283214e01112dd4ba4ac7af1fc638a6e2301e6c18b7f3036f27bc
|
image: ghcr.io/goauthentik/server@sha256:5823497f0dade4976c7804a8612005db65b59c71e2c1f2903e3716b02db4a82c
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: worker
|
command: worker
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
version: '3.9'
|
version: '3.9'
|
||||||
services:
|
services:
|
||||||
sabnzbd:
|
sabnzbd:
|
||||||
image: ghcr.io/linuxserver/sabnzbd@sha256:223197e9cbb70112244e44ba9660ba7ce1d2128771b8a03ad38e20f85c953583
|
image: ghcr.io/linuxserver/sabnzbd@sha256:66576a72ecb80c8d9e8ebffd4699995b29bfff4aefba4c6eae14baac3cbf6716
|
||||||
container_name: sabnzbd
|
container_name: sabnzbd
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
jellyfin:
|
jellyfin:
|
||||||
image: ghcr.io/linuxserver/jellyfin@sha256:266a8e1a6dc8e01270935a358effee2b0711af23e0e5479985a6501ce1978da7
|
image: ghcr.io/linuxserver/jellyfin@sha256:01cd85925160e4ed20d74cc7c59fd4b166d7ff6349788f6ce390f5672b6c019b
|
||||||
container_name: jellyfin
|
container_name: jellyfin
|
||||||
devices:
|
devices:
|
||||||
- /dev/dri/renderD129:/dev/dri/renderD129
|
- /dev/dri/renderD129:/dev/dri/renderD129
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
kasm:
|
kasm:
|
||||||
image: ghcr.io/linuxserver/kasm@sha256:0647c0dec5ab0f59978e3b0b04ac795416bdeb59423e79ab2f3cb97b522c0c49
|
image: ghcr.io/linuxserver/kasm@sha256:61dade41cda3a7253879f3139106d3c53de6a675baa8492b1847b91260d0d26b
|
||||||
container_name: kasm
|
container_name: kasm
|
||||||
privileged: true
|
privileged: true
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
services:
|
services:
|
||||||
netbootxyz:
|
netbootxyz:
|
||||||
image: ghcr.io/linuxserver/netbootxyz@sha256:707d6aa700c133de0209119636237fd2a431f5a927c62b040c90ba726b831ef7
|
image: ghcr.io/linuxserver/netbootxyz@sha256:18f5faec9e1f4362e6d1d1e7cbde3a2c8d6733dc7c00a9958b3aa88d28e8eb4b
|
||||||
container_name: netboot
|
container_name: netboot
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
- PUID=1000
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
services:
|
services:
|
||||||
portainer:
|
portainer:
|
||||||
image: portainer/portainer-ee@sha256:0aa305da72738d9f90a209bf74bdc74172004690fa298f52d5f92dd065f26aea
|
image: portainer/portainer-ee@sha256:40691e7fbcc4effc4973eaad804b1874814fe8327f908d19da11468a45db20a8
|
||||||
container_name: portainer
|
container_name: portainer
|
||||||
command: -H unix:///var/run/docker.sock
|
command: -H unix:///var/run/docker.sock
|
||||||
ports:
|
ports:
|
||||||
|
@ -15,35 +15,15 @@ services:
|
||||||
image: vikunja/vikunja@sha256:c31c7d6cad49038ab8a7d1414845d4c45539b43dd6ddd082bcd148e6fcd7b01c
|
image: vikunja/vikunja@sha256:c31c7d6cad49038ab8a7d1414845d4c45539b43dd6ddd082bcd148e6fcd7b01c
|
||||||
environment:
|
environment:
|
||||||
VIKUNJA_SERVICE_PUBLICURL: $VIKUNJA_SERVICE_PUBLICURL
|
VIKUNJA_SERVICE_PUBLICURL: $VIKUNJA_SERVICE_PUBLICURL
|
||||||
VIKUNJA_DATABASE_HOST: db
|
VIKUNJA_DATABASE_TYPE: sqlite
|
||||||
VIKUNJA_DATABASE_PASSWORD: $VIKUNJA_DATABASE_PASSWORD
|
|
||||||
VIKUNJA_DATABASE_TYPE: mysql
|
|
||||||
VIKUNJA_DATABASE_USER: vikunja
|
|
||||||
VIKUNJA_DATABASE_DATABASE: vikunja
|
|
||||||
VIKUNJA_SERVICE_JWTSECRET: $VIKUNJA_SERVICE_JWTSECRET
|
VIKUNJA_SERVICE_JWTSECRET: $VIKUNJA_SERVICE_JWTSECRET
|
||||||
|
VIKUNJA_DATABASE_PATH: /db/vikunja.db
|
||||||
ports:
|
ports:
|
||||||
- 3456:3456
|
- 3456:3456
|
||||||
volumes:
|
volumes:
|
||||||
- /home/mafyuh/vikunja/files:/app/vikunja/files
|
- /home/mafyuh/vikunja/files:/app/vikunja/files
|
||||||
depends_on:
|
- /home/mafyuh/vikunja/db:/db
|
||||||
db:
|
|
||||||
condition: service_healthy
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
db:
|
|
||||||
image: mariadb:10
|
|
||||||
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
|
|
||||||
environment:
|
|
||||||
MYSQL_ROOT_PASSWORD: $MYSQL_ROOT_PASSWORD
|
|
||||||
MYSQL_USER: vikunja
|
|
||||||
MYSQL_PASSWORD: $MYSQL_PASSWORD
|
|
||||||
MYSQL_DATABASE: vikunja
|
|
||||||
volumes:
|
|
||||||
- /home/mafyuh/vikunja/db:/var/lib/mysql
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "mysqladmin ping -h localhost -u $$MYSQL_USER --password=$$MYSQL_PASSWORD"]
|
|
||||||
interval: 2s
|
|
||||||
start_period: 30s
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
portainer_data:
|
portainer_data:
|
||||||
|
|
Loading…
Reference in a new issue