Skip to content

Commit 4760a17

Browse files
committedJul 20, 2024
migrate docker
1 parent 0ef86a1 commit 4760a17

File tree

12 files changed

+97
-38
lines changed

12 files changed

+97
-38
lines changed
 

‎docker/AI/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3.8"
22

33
services:
44
ollama:
5-
image: docker.mafyuh.xyz/ollama/ollama:0.1.45
5+
image: docker.mafyuh.xyz/ollama/ollama:0.2.6
66
container_name: ollama
77
restart: unless-stopped
88
volumes:
@@ -18,7 +18,7 @@ services:
1818
capabilities: [gpu]
1919

2020
open-webui:
21-
image: ghcr.io/open-webui/open-webui:0.3.5
21+
image: ghcr.io/open-webui/open-webui:v0.3.10
2222
container_name: open-webui
2323
restart: unless-stopped
2424
ports:
@@ -29,7 +29,7 @@ services:
2929
- host.docker.internal:host-gateway
3030

3131
mindsdb:
32-
image: docker.mafyuh.xyz/mindsdb/mindsdb:v24.6.3.1
32+
image: docker.mafyuh.xyz/mindsdb/mindsdb:v24.7.3.0
3333
container_name: mindsdb
3434
ports:
3535
- 47334:47334

‎docker/ag-backup/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
adguardhome:
4-
image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.51
4+
image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.52
55
container_name: adguardhome
66
restart: unless-stopped
77
volumes:

‎docker/ag-main/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
adguardhome:
4-
image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.51
4+
image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.52
55
container_name: adguardhome
66
restart: unless-stopped
77
volumes:
@@ -22,7 +22,7 @@ services:
2222
- 5443:5443/udp
2323

2424
adguardhome-sync:
25-
image: ghcr.io/linuxserver/adguardhome-sync@sha256:67962a0e15bf1a41e4bc0083d93d7e0268ad6431482c337ef49d5f2673c36c71
25+
image: ghcr.io/linuxserver/adguardhome-sync@sha256:ee2ddd62c61d13e01da7f96135d1438376a22992c7d9951b2429bb2cfd64a05a
2626
container_name: adguardhome-sync
2727
environment:
2828
- PUID=1000

‎docker/arm/docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
server:
4-
image: codeberg.org/forgejo/forgejo:7.0.4
4+
image: codeberg.org/forgejo/forgejo:7.0.5
55
container_name: forgejo
66
environment:
77
- USER_UID=1000
@@ -38,7 +38,7 @@ services:
3838
- /home/ubuntu/forgejo/mysql:/var/lib/mysql
3939

4040
gotify:
41-
image: docker.mafyuh.xyz/gotify/server-arm7:2.4.0
41+
image: docker.mafyuh.xyz/gotify/server-arm7:2.5.0
4242
container_name: gotify
4343
ports:
4444
- 9008:80
@@ -53,7 +53,7 @@ services:
5353
- gitea_main
5454

5555
nginx-proxy-manager:
56-
image: docker.mafyuh.xyz/jc21/nginx-proxy-manager:2.11.2
56+
image: docker.mafyuh.xyz/jc21/nginx-proxy-manager:2.11.3
5757
container_name: nginx-proxy-manager
5858
ports:
5959
- 80:80
@@ -137,7 +137,7 @@ services:
137137
ipv4_address: 172.25.0.25
138138

139139
syncthing:
140-
image: ghcr.io/linuxserver/syncthing@sha256:6e70dd0cc0ddb038a8f58cf0945d6659b13c984f11d708407469bf16d520574c
140+
image: ghcr.io/linuxserver/syncthing@sha256:6fb87abe19730aad01b6511d660a0664be424986ae662b85eb76f0ce585c4890
141141
container_name: syncthing
142142
hostname: ARM #optional
143143
environment:

‎docker/arrs/docker-compose.yml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
bazarr:
4-
image: ghcr.io/linuxserver/bazarr@sha256:6fb83511c0dca70a400fde79cb45ed59c4f66ea30dcba8c6f9274f01d77e5aef
4+
image: ghcr.io/linuxserver/bazarr@sha256:5da74fc1bbd5da69e3b4f9b2376f6ccfbe3b47f143e6eb5651ed37cc1d4412dd
55
container_name: bazarr
66
ports:
77
- "6767:6767"
@@ -15,7 +15,7 @@ services:
1515
- PGID=1000
1616

1717
lidarr:
18-
image: ghcr.io/linuxserver/lidarr@sha256:a7d0282dcdbf5b11306cc4054c11b42252106b5e8494375231322822d31ac9f6
18+
image: ghcr.io/linuxserver/lidarr@sha256:3c093803236a9f694f805392a5d6461b550f70b3f9cf4be0bc73b3428e3dbe90
1919
container_name: lidarr
2020
ports:
2121
- "8686:8686"
@@ -31,7 +31,7 @@ services:
3131
- PGID=1000
3232

3333
prowlarr:
34-
image: ghcr.io/linuxserver/prowlarr@sha256:237e9a72c11c5350bf22e355759436ecd4fd660e820d5b556d9a9e436f25f6b9
34+
image: ghcr.io/linuxserver/prowlarr@sha256:7c3e7840c726828643131583514b66f38e7af29021d5a7b05ed8ed5c8ec0b596
3535
container_name: prowlarr
3636
ports:
3737
- "9696:9696"
@@ -43,7 +43,7 @@ services:
4343
- PGID=1000
4444

4545
radarr:
46-
image: ghcr.io/linuxserver/radarr@sha256:40f10a3d826f6c231d338738c3c86bf0d23a9546f20f8b1b504c6c579b79992c
46+
image: ghcr.io/linuxserver/radarr@sha256:1eaf9e83fca2b9170d4f49f6c0e55ba38693718e7815743a9ec297d199ab1e73
4747
container_name: radarr
4848
ports:
4949
- "7878:7878"
@@ -57,7 +57,7 @@ services:
5757
- PGID=1000
5858

5959
sonarr:
60-
image: ghcr.io/linuxserver/sonarr@sha256:275467ba17d990bbc6301dec3cc76b042969836749de39067818759d0f3b407f
60+
image: ghcr.io/linuxserver/sonarr@sha256:fbee5770f688e4f89dd073534feda11251bfde0e0a4e6ac74dd8c33bb856b505
6161
container_name: sonarr
6262
ports:
6363
- "8989:8989"
@@ -91,7 +91,7 @@ services:
9191
- AUTH_OIDC_ADMIN_GROUP=${AUTH_OIDC_ADMIN_GROUP}
9292

9393
doplarr:
94-
image: ghcr.io/linuxserver/doplarr@sha256:20981fa1a4087d5369b9eaf756ab179352e05fe914b88c36f468ee3cd9a1ce98
94+
image: ghcr.io/linuxserver/doplarr@sha256:b71ea85a718b4ed924f132c6a5e62ddef68a7f43ba137f4f30900067532a5d9a
9595
container_name: doplarr
9696
environment:
9797
- PUID=1000
@@ -140,7 +140,7 @@ services:
140140
image: gcr.io/cadvisor/cadvisor:v0.49.1
141141

142142
syncthing:
143-
image: ghcr.io/linuxserver/syncthing@sha256:6e70dd0cc0ddb038a8f58cf0945d6659b13c984f11d708407469bf16d520574c
143+
image: ghcr.io/linuxserver/syncthing@sha256:6fb87abe19730aad01b6511d660a0664be424986ae662b85eb76f0ce585c4890
144144
container_name: syncthing
145145
hostname: ARRS
146146
environment:
@@ -157,6 +157,21 @@ services:
157157
- 21027:21027/udp
158158
restart: unless-stopped
159159

160+
code-server:
161+
image: ghcr.io/linuxserver/code-server@sha256:1eb6671a1bc500028e1d7a44eccbfdffbb2d802840c6d7f9e83cc87e1003da94
162+
container_name: code-server
163+
environment:
164+
- PUID=1000
165+
- PGID=1000
166+
- TZ=Etc/UTC
167+
- SUDO_PASSWORD=$SUDO_PASSWORD
168+
- PROXY_DOMAIN=$PROXY_DOMAIN
169+
volumes:
170+
- /docker/appdata/code-server/config:/config
171+
ports:
172+
- 8443:8443
173+
restart: unless-stopped
174+
160175
networks:
161176
default:
162177
name: arrs_default

‎docker/authentik/docker-compose.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.4"
33

44
services:
55
postgresql:
6-
image: docker.io/library/postgres:12-alpine
6+
image: docker.io/library/postgres:16-alpine
77
restart: unless-stopped
88
healthcheck:
99
test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
@@ -32,7 +32,7 @@ services:
3232
volumes:
3333
- redis:/data
3434
server:
35-
image: ghcr.io/goauthentik/server@sha256:a2e592a08eb3c9e3435aa4e6585d60cc1eb54850da9d1498d56a131bbfbe03ff
35+
image: ghcr.io/goauthentik/server@sha256:f79b6cf35b29a8591136afb633ddd46da303e9cd2ca82c7cdfbd020a780e15e8
3636
restart: unless-stopped
3737
command: server
3838
environment:
@@ -53,7 +53,7 @@ services:
5353
- postgresql
5454
- redis
5555
worker:
56-
image: ghcr.io/goauthentik/server@sha256:a2e592a08eb3c9e3435aa4e6585d60cc1eb54850da9d1498d56a131bbfbe03ff
56+
image: ghcr.io/goauthentik/server@sha256:f79b6cf35b29a8591136afb633ddd46da303e9cd2ca82c7cdfbd020a780e15e8
5757
restart: unless-stopped
5858
command: worker
5959
environment:
@@ -79,15 +79,6 @@ services:
7979
depends_on:
8080
- postgresql
8181
- redis
82-
authentik_ldap:
83-
image: ghcr.io/goauthentik/ldap@sha256:7f317da9b736dec3e53b71b7face1787d4f15aee00e80d003e5ff3b2d49ee382
84-
ports:
85-
- 389:3389
86-
- 636:6636
87-
environment:
88-
AUTHENTIK_HOST: ${AUTH_HOST}
89-
AUTHENTIK_INSECURE: "true"
90-
AUTHENTIK_TOKEN: ${AUTH_TOKEN}
9182

9283
volumes:
9384
database:
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
services:
3+
docker-in-docker:
4+
image: docker:dind
5+
container_name: 'docker_dind'
6+
privileged: 'true'
7+
command: ['dockerd', '-H', 'tcp://0.0.0.0:2375', '--tls=false']
8+
restart: 'unless-stopped'
9+
10+
gitea:
11+
image: 'code.forgejo.org/forgejo/runner:3.5.0'
12+
links:
13+
- docker-in-docker
14+
depends_on:
15+
docker-in-docker:
16+
condition: service_started
17+
container_name: 'runner'
18+
environment:
19+
DOCKER_HOST: tcp://docker-in-docker:2375
20+
# User without root privileges, but with access to `/data`.
21+
user: 1000:1000
22+
volumes:
23+
- /home/mafyuh/data:/data
24+
restart: 'unless-stopped'
25+
26+
command: '/bin/sh -c "sleep 5; forgejo-runner daemon"'

‎docker/downloaders/docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.9'
22
services:
33
sabnzbd:
4-
image: ghcr.io/linuxserver/sabnzbd@sha256:4fb40ea724abc25cf9496cdbc8e528aa0882132737e49c5e712c264284fa7b94
4+
image: ghcr.io/linuxserver/sabnzbd@sha256:31ea64a7ce1e9a5ff8187f9b7c905eaa1d0a79d49b04724e47059c67407157eb
55
container_name: sabnzbd
66
environment:
77
- PUID=1000
@@ -32,7 +32,7 @@ services:
3232
- VPN_USER=mafyuh+pmp
3333
- VPN_PASS=
3434
- STRICT_PORT_FORWARD=yes
35-
- LAN_NETWORK=10.0.0.0/24,10.69.69.0/24
35+
- LAN_NETWORK=$LAN_NETWORK
3636
- ENABLE_PRIVOXY=yes
3737
- PUID=1000
3838
- PGID=1000
@@ -48,7 +48,7 @@ services:
4848
restart: unless-stopped
4949

5050
flaresolverr:
51-
image: ghcr.io/flaresolverr/flaresolverr:v3.3.20
51+
image: ghcr.io/flaresolverr/flaresolverr:v3.3.21
5252
container_name: flaresolverr
5353
ports:
5454
- '8191:8191'
@@ -72,7 +72,7 @@ services:
7272
image: gcr.io/cadvisor/cadvisor:v0.49.1
7373

7474
node-exporter:
75-
image: docker.mafyuh.xyz/prom/node-exporter:v1.8.1
75+
image: docker.mafyuh.xyz/prom/node-exporter:v1.8.2
7676
container_name: monitoring_node_exporter
7777
restart: unless-stopped
7878
ports:

‎docker/jellyfin/docker-compose.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
jellyfin:
4-
image: ghcr.io/linuxserver/jellyfin@sha256:a363aa018edee61bcee46be5f8dbd0db2a317b2bc0f95121a46e522d798c2a63
4+
image: ghcr.io/linuxserver/jellyfin@sha256:6844dff8f5b130a19625c3ad051c63597480bc0b9da77b5bd10f58aa719dab91
55
container_name: jellyfin
66
devices:
77
- /dev/dri/renderD129:/dev/dri/renderD129
@@ -13,6 +13,7 @@ services:
1313
volumes:
1414
- /home/mafyuh/jellyfin/config:/config
1515
- /mnt/thePoolShare/Media:/Media
16+
- /mnt/thePoolShare/Media/Youtube:/Media/Youtube:ro
1617
- /home/mafyuh/jellyfin/transcodes:/transcodes
1718
- /home/mafyuh/jellyfin/cache:/nvmecache
1819
- /home/mafyuh/jellyfin/metadata:/nvmemetadata
@@ -21,7 +22,7 @@ services:
2122
restart: unless-stopped
2223

2324
makemkv:
24-
image: docker.mafyuh.xyz/jlesage/makemkv@sha256:7af8a5d70006cbf0fc5ea54971779bc8b35f976dd844db173f5bc28ae97876b7
25+
image: docker.mafyuh.xyz/jlesage/makemkv@sha256:39dccc4f82dc76668a78543ac7392a43b6bc6c069e1a3e47e8c058c6cb5f09b0
2526
container_name: makemkv
2627
ports:
2728
- 5800:5800
@@ -34,7 +35,7 @@ services:
3435
privileged: true
3536

3637
syncthing:
37-
image: ghcr.io/linuxserver/syncthing@sha256:6e70dd0cc0ddb038a8f58cf0945d6659b13c984f11d708407469bf16d520574c
38+
image: ghcr.io/linuxserver/syncthing@sha256:6fb87abe19730aad01b6511d660a0664be424986ae662b85eb76f0ce585c4890
3839
container_name: syncthing
3940
hostname: JF
4041
environment:

‎docker/netboot/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
netbootxyz:
4-
image: ghcr.io/linuxserver/netbootxyz@sha256:dce6b2c729611f1090f2e6479b764d98aef24cc340d018d923fa6678fcbf330e
4+
image: ghcr.io/linuxserver/netbootxyz@sha256:3e7af245944519374e7e01422024f3b5baf67fa252ec92390fee1d57cd6cc1f6
55
container_name: netboot
66
environment:
77
- PUID=1000

‎docker/nexus/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
nexus:
4-
image: docker.mafyuh.xyz/sonatype/nexus3:3.69.0
4+
image: docker.mafyuh.xyz/sonatype/nexus3:3.70.1
55
container_name: nexus
66
restart: unless-stopped
77
ports:

‎docker/runner/docker-compose.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
services:
3+
docker-in-docker:
4+
image: docker:dind
5+
container_name: 'docker_dind'
6+
privileged: 'true'
7+
command: ['dockerd', '-H', 'tcp://0.0.0.0:2375', '--tls=false']
8+
restart: 'unless-stopped'
9+
10+
gitea:
11+
image: 'code.forgejo.org/forgejo/runner:3.5.0'
12+
links:
13+
- docker-in-docker
14+
depends_on:
15+
docker-in-docker:
16+
condition: service_started
17+
container_name: 'runner'
18+
environment:
19+
DOCKER_HOST: tcp://docker-in-docker:2375
20+
# User without root privileges, but with access to `/data`.
21+
user: 1000:1000
22+
volumes:
23+
- /home/mafyuh/data:/data
24+
restart: 'unless-stopped'
25+
26+
command: '/bin/sh -c "sleep 5; forgejo-runner daemon"'

0 commit comments

Comments
 (0)
Please sign in to comment.