From 5542bf833883538612cbeef6902c95c1d113d9a2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 20 Jul 2024 15:34:53 +0000 Subject: [PATCH 01/45] :arrow_up: Update docker.mafyuh.xyz/vaultwarden/server Docker tag to v1.31.0 --- docker/arm/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index 2c96a42..800962a 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -122,7 +122,7 @@ services: - gitea_main vaultwarden: - image: docker.mafyuh.xyz/vaultwarden/server:1.30.5 + image: docker.mafyuh.xyz/vaultwarden/server:1.31.0 container_name: vaultwarden ports: - 8989:80 From 24c6be33ea5c1bcfcb670ce7f6d6d32dc020f715 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 20 Jul 2024 15:34:56 +0000 Subject: [PATCH 02/45] :arrow_up: Update ghcr.io/n8n-io/n8n Docker tag to v1.51.0 --- docker/arm/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index 2c96a42..301df70 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -107,7 +107,7 @@ services: networks: - gitea_main n8n: - image: ghcr.io/n8n-io/n8n:1.47.0 + image: ghcr.io/n8n-io/n8n:1.51.0 container_name: n8n ports: - 5678:5678 From 63a0dba31707eefa2fad46d3823eef9380299dab Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 20 Jul 2024 15:35:10 +0000 Subject: [PATCH 03/45] :arrow_up: Update onerahmet/openai-whisper-asr-webservice Docker tag to v1.5.0 --- docker/whisper/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/whisper/docker-compose.yml b/docker/whisper/docker-compose.yml index 85abecd..4718ba1 100644 --- a/docker/whisper/docker-compose.yml +++ b/docker/whisper/docker-compose.yml @@ -3,7 +3,7 @@ version: "2.1" services: whisperasr: container_name: whisper - image: onerahmet/openai-whisper-asr-webservice:v1.4.1-gpu + image: onerahmet/openai-whisper-asr-webservice:v1.5.0-gpu environment: - ASR_MODEL=base.en - ASR_ENGINE=faster_whisper From 4760a1773da5335d829ab8eb4086d5868f589551 Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Sat, 20 Jul 2024 11:44:50 -0400 Subject: [PATCH 04/45] migrate docker --- docker/AI/docker-compose.yml | 6 ++--- docker/ag-backup/docker-compose.yml | 2 +- docker/ag-main/docker-compose.yml | 4 ++-- docker/arm/docker-compose.yml | 8 +++---- docker/arrs/docker-compose.yml | 29 +++++++++++++++++++------ docker/authentik/docker-compose.yml | 15 +++---------- docker/docker-runner/docker-compose.yml | 26 ++++++++++++++++++++++ docker/downloaders/docker-compose.yml | 8 +++---- docker/jellyfin/docker-compose.yml | 7 +++--- docker/netboot/docker-compose.yml | 2 +- docker/nexus/docker-compose.yml | 2 +- docker/runner/docker-compose.yml | 26 ++++++++++++++++++++++ 12 files changed, 97 insertions(+), 38 deletions(-) create mode 100644 docker/docker-runner/docker-compose.yml create mode 100644 docker/runner/docker-compose.yml diff --git a/docker/AI/docker-compose.yml b/docker/AI/docker-compose.yml index cc0f340..c925ce4 100644 --- a/docker/AI/docker-compose.yml +++ b/docker/AI/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: ollama: - image: docker.mafyuh.xyz/ollama/ollama:0.1.45 + image: docker.mafyuh.xyz/ollama/ollama:0.2.6 container_name: ollama restart: unless-stopped volumes: @@ -18,7 +18,7 @@ services: capabilities: [gpu] open-webui: - image: ghcr.io/open-webui/open-webui:0.3.5 + image: ghcr.io/open-webui/open-webui:v0.3.10 container_name: open-webui restart: unless-stopped ports: @@ -29,7 +29,7 @@ services: - host.docker.internal:host-gateway mindsdb: - image: docker.mafyuh.xyz/mindsdb/mindsdb:v24.6.3.1 + image: docker.mafyuh.xyz/mindsdb/mindsdb:v24.7.3.0 container_name: mindsdb ports: - 47334:47334 diff --git a/docker/ag-backup/docker-compose.yml b/docker/ag-backup/docker-compose.yml index f01af6a..1b75373 100644 --- a/docker/ag-backup/docker-compose.yml +++ b/docker/ag-backup/docker-compose.yml @@ -1,7 +1,7 @@ --- services: adguardhome: - image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.51 + image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.52 container_name: adguardhome restart: unless-stopped volumes: diff --git a/docker/ag-main/docker-compose.yml b/docker/ag-main/docker-compose.yml index a1b3c2a..157303f 100644 --- a/docker/ag-main/docker-compose.yml +++ b/docker/ag-main/docker-compose.yml @@ -1,7 +1,7 @@ --- services: adguardhome: - image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.51 + image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.52 container_name: adguardhome restart: unless-stopped volumes: @@ -22,7 +22,7 @@ services: - 5443:5443/udp adguardhome-sync: - image: ghcr.io/linuxserver/adguardhome-sync@sha256:67962a0e15bf1a41e4bc0083d93d7e0268ad6431482c337ef49d5f2673c36c71 + image: ghcr.io/linuxserver/adguardhome-sync@sha256:ee2ddd62c61d13e01da7f96135d1438376a22992c7d9951b2429bb2cfd64a05a container_name: adguardhome-sync environment: - PUID=1000 diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index 4277499..2af0c40 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -1,7 +1,7 @@ --- services: server: - image: codeberg.org/forgejo/forgejo:7.0.4 + image: codeberg.org/forgejo/forgejo:7.0.5 container_name: forgejo environment: - USER_UID=1000 @@ -38,7 +38,7 @@ services: - /home/ubuntu/forgejo/mysql:/var/lib/mysql gotify: - image: docker.mafyuh.xyz/gotify/server-arm7:2.4.0 + image: docker.mafyuh.xyz/gotify/server-arm7:2.5.0 container_name: gotify ports: - 9008:80 @@ -53,7 +53,7 @@ services: - gitea_main 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 ports: - 80:80 @@ -137,7 +137,7 @@ services: ipv4_address: 172.25.0.25 syncthing: - image: ghcr.io/linuxserver/syncthing@sha256:6e70dd0cc0ddb038a8f58cf0945d6659b13c984f11d708407469bf16d520574c + image: ghcr.io/linuxserver/syncthing@sha256:6fb87abe19730aad01b6511d660a0664be424986ae662b85eb76f0ce585c4890 container_name: syncthing hostname: ARM #optional environment: diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index f0e296c..20d278c 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -1,7 +1,7 @@ --- services: bazarr: - image: ghcr.io/linuxserver/bazarr@sha256:6fb83511c0dca70a400fde79cb45ed59c4f66ea30dcba8c6f9274f01d77e5aef + image: ghcr.io/linuxserver/bazarr@sha256:5da74fc1bbd5da69e3b4f9b2376f6ccfbe3b47f143e6eb5651ed37cc1d4412dd container_name: bazarr ports: - "6767:6767" @@ -15,7 +15,7 @@ services: - PGID=1000 lidarr: - image: ghcr.io/linuxserver/lidarr@sha256:a7d0282dcdbf5b11306cc4054c11b42252106b5e8494375231322822d31ac9f6 + image: ghcr.io/linuxserver/lidarr@sha256:3c093803236a9f694f805392a5d6461b550f70b3f9cf4be0bc73b3428e3dbe90 container_name: lidarr ports: - "8686:8686" @@ -31,7 +31,7 @@ services: - PGID=1000 prowlarr: - image: ghcr.io/linuxserver/prowlarr@sha256:237e9a72c11c5350bf22e355759436ecd4fd660e820d5b556d9a9e436f25f6b9 + image: ghcr.io/linuxserver/prowlarr@sha256:7c3e7840c726828643131583514b66f38e7af29021d5a7b05ed8ed5c8ec0b596 container_name: prowlarr ports: - "9696:9696" @@ -43,7 +43,7 @@ services: - PGID=1000 radarr: - image: ghcr.io/linuxserver/radarr@sha256:40f10a3d826f6c231d338738c3c86bf0d23a9546f20f8b1b504c6c579b79992c + image: ghcr.io/linuxserver/radarr@sha256:1eaf9e83fca2b9170d4f49f6c0e55ba38693718e7815743a9ec297d199ab1e73 container_name: radarr ports: - "7878:7878" @@ -57,7 +57,7 @@ services: - PGID=1000 sonarr: - image: ghcr.io/linuxserver/sonarr@sha256:275467ba17d990bbc6301dec3cc76b042969836749de39067818759d0f3b407f + image: ghcr.io/linuxserver/sonarr@sha256:fbee5770f688e4f89dd073534feda11251bfde0e0a4e6ac74dd8c33bb856b505 container_name: sonarr ports: - "8989:8989" @@ -91,7 +91,7 @@ services: - AUTH_OIDC_ADMIN_GROUP=${AUTH_OIDC_ADMIN_GROUP} doplarr: - image: ghcr.io/linuxserver/doplarr@sha256:20981fa1a4087d5369b9eaf756ab179352e05fe914b88c36f468ee3cd9a1ce98 + image: ghcr.io/linuxserver/doplarr@sha256:b71ea85a718b4ed924f132c6a5e62ddef68a7f43ba137f4f30900067532a5d9a container_name: doplarr environment: - PUID=1000 @@ -140,7 +140,7 @@ services: image: gcr.io/cadvisor/cadvisor:v0.49.1 syncthing: - image: ghcr.io/linuxserver/syncthing@sha256:6e70dd0cc0ddb038a8f58cf0945d6659b13c984f11d708407469bf16d520574c + image: ghcr.io/linuxserver/syncthing@sha256:6fb87abe19730aad01b6511d660a0664be424986ae662b85eb76f0ce585c4890 container_name: syncthing hostname: ARRS environment: @@ -157,6 +157,21 @@ services: - 21027:21027/udp restart: unless-stopped + code-server: + image: ghcr.io/linuxserver/code-server@sha256:1eb6671a1bc500028e1d7a44eccbfdffbb2d802840c6d7f9e83cc87e1003da94 + 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: default: name: arrs_default diff --git a/docker/authentik/docker-compose.yml b/docker/authentik/docker-compose.yml index 45590e2..ed049d2 100644 --- a/docker/authentik/docker-compose.yml +++ b/docker/authentik/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.4" services: postgresql: - image: docker.io/library/postgres:12-alpine + image: docker.io/library/postgres:16-alpine restart: unless-stopped healthcheck: test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"] @@ -32,7 +32,7 @@ services: volumes: - redis:/data server: - image: ghcr.io/goauthentik/server@sha256:a2e592a08eb3c9e3435aa4e6585d60cc1eb54850da9d1498d56a131bbfbe03ff + image: ghcr.io/goauthentik/server@sha256:f79b6cf35b29a8591136afb633ddd46da303e9cd2ca82c7cdfbd020a780e15e8 restart: unless-stopped command: server environment: @@ -53,7 +53,7 @@ services: - postgresql - redis worker: - image: ghcr.io/goauthentik/server@sha256:a2e592a08eb3c9e3435aa4e6585d60cc1eb54850da9d1498d56a131bbfbe03ff + image: ghcr.io/goauthentik/server@sha256:f79b6cf35b29a8591136afb633ddd46da303e9cd2ca82c7cdfbd020a780e15e8 restart: unless-stopped command: worker environment: @@ -79,15 +79,6 @@ services: depends_on: - postgresql - 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: database: diff --git a/docker/docker-runner/docker-compose.yml b/docker/docker-runner/docker-compose.yml new file mode 100644 index 0000000..7a76451 --- /dev/null +++ b/docker/docker-runner/docker-compose.yml @@ -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"' diff --git a/docker/downloaders/docker-compose.yml b/docker/downloaders/docker-compose.yml index 479bc9f..7e41091 100644 --- a/docker/downloaders/docker-compose.yml +++ b/docker/downloaders/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.9' services: sabnzbd: - image: ghcr.io/linuxserver/sabnzbd@sha256:4fb40ea724abc25cf9496cdbc8e528aa0882132737e49c5e712c264284fa7b94 + image: ghcr.io/linuxserver/sabnzbd@sha256:31ea64a7ce1e9a5ff8187f9b7c905eaa1d0a79d49b04724e47059c67407157eb container_name: sabnzbd environment: - PUID=1000 @@ -32,7 +32,7 @@ services: - VPN_USER=mafyuh+pmp - VPN_PASS= - STRICT_PORT_FORWARD=yes - - LAN_NETWORK=10.0.0.0/24,10.69.69.0/24 + - LAN_NETWORK=$LAN_NETWORK - ENABLE_PRIVOXY=yes - PUID=1000 - PGID=1000 @@ -48,7 +48,7 @@ services: restart: unless-stopped flaresolverr: - image: ghcr.io/flaresolverr/flaresolverr:v3.3.20 + image: ghcr.io/flaresolverr/flaresolverr:v3.3.21 container_name: flaresolverr ports: - '8191:8191' @@ -72,7 +72,7 @@ services: image: gcr.io/cadvisor/cadvisor:v0.49.1 node-exporter: - image: docker.mafyuh.xyz/prom/node-exporter:v1.8.1 + image: docker.mafyuh.xyz/prom/node-exporter:v1.8.2 container_name: monitoring_node_exporter restart: unless-stopped ports: diff --git a/docker/jellyfin/docker-compose.yml b/docker/jellyfin/docker-compose.yml index 7ece065..02ae235 100644 --- a/docker/jellyfin/docker-compose.yml +++ b/docker/jellyfin/docker-compose.yml @@ -1,7 +1,7 @@ --- services: jellyfin: - image: ghcr.io/linuxserver/jellyfin@sha256:a363aa018edee61bcee46be5f8dbd0db2a317b2bc0f95121a46e522d798c2a63 + image: ghcr.io/linuxserver/jellyfin@sha256:6844dff8f5b130a19625c3ad051c63597480bc0b9da77b5bd10f58aa719dab91 container_name: jellyfin devices: - /dev/dri/renderD129:/dev/dri/renderD129 @@ -13,6 +13,7 @@ services: volumes: - /home/mafyuh/jellyfin/config:/config - /mnt/thePoolShare/Media:/Media + - /mnt/thePoolShare/Media/Youtube:/Media/Youtube:ro - /home/mafyuh/jellyfin/transcodes:/transcodes - /home/mafyuh/jellyfin/cache:/nvmecache - /home/mafyuh/jellyfin/metadata:/nvmemetadata @@ -21,7 +22,7 @@ services: restart: unless-stopped makemkv: - image: docker.mafyuh.xyz/jlesage/makemkv@sha256:7af8a5d70006cbf0fc5ea54971779bc8b35f976dd844db173f5bc28ae97876b7 + image: docker.mafyuh.xyz/jlesage/makemkv@sha256:39dccc4f82dc76668a78543ac7392a43b6bc6c069e1a3e47e8c058c6cb5f09b0 container_name: makemkv ports: - 5800:5800 @@ -34,7 +35,7 @@ services: privileged: true syncthing: - image: ghcr.io/linuxserver/syncthing@sha256:6e70dd0cc0ddb038a8f58cf0945d6659b13c984f11d708407469bf16d520574c + image: ghcr.io/linuxserver/syncthing@sha256:6fb87abe19730aad01b6511d660a0664be424986ae662b85eb76f0ce585c4890 container_name: syncthing hostname: JF environment: diff --git a/docker/netboot/docker-compose.yml b/docker/netboot/docker-compose.yml index 814738f..bd30952 100644 --- a/docker/netboot/docker-compose.yml +++ b/docker/netboot/docker-compose.yml @@ -1,7 +1,7 @@ --- services: netbootxyz: - image: ghcr.io/linuxserver/netbootxyz@sha256:dce6b2c729611f1090f2e6479b764d98aef24cc340d018d923fa6678fcbf330e + image: ghcr.io/linuxserver/netbootxyz@sha256:3e7af245944519374e7e01422024f3b5baf67fa252ec92390fee1d57cd6cc1f6 container_name: netboot environment: - PUID=1000 diff --git a/docker/nexus/docker-compose.yml b/docker/nexus/docker-compose.yml index a09a185..cc6c84d 100644 --- a/docker/nexus/docker-compose.yml +++ b/docker/nexus/docker-compose.yml @@ -1,7 +1,7 @@ --- services: nexus: - image: docker.mafyuh.xyz/sonatype/nexus3:3.69.0 + image: docker.mafyuh.xyz/sonatype/nexus3:3.70.1 container_name: nexus restart: unless-stopped ports: diff --git a/docker/runner/docker-compose.yml b/docker/runner/docker-compose.yml new file mode 100644 index 0000000..7a76451 --- /dev/null +++ b/docker/runner/docker-compose.yml @@ -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"' From 9a123ff951cf9146538eae74e094dd7b6f241b6a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 21 Jul 2024 07:00:52 +0000 Subject: [PATCH 05/45] :arrow_up: Update ghcr.io/linuxserver/jellyfin Docker digest to 843878f --- docker/jellyfin/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.yml b/docker/jellyfin/docker-compose.yml index 02ae235..a5fa894 100644 --- a/docker/jellyfin/docker-compose.yml +++ b/docker/jellyfin/docker-compose.yml @@ -1,7 +1,7 @@ --- services: jellyfin: - image: ghcr.io/linuxserver/jellyfin@sha256:6844dff8f5b130a19625c3ad051c63597480bc0b9da77b5bd10f58aa719dab91 + image: ghcr.io/linuxserver/jellyfin@sha256:843878f35dc700e502798b39edb24b84b7b7ff0788f1b7b9b1e71d4f8d34f951 container_name: jellyfin devices: - /dev/dri/renderD129:/dev/dri/renderD129 From 3f5b02ac6f13a94b0d6f7d0b04858cb9c7752673 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 21 Jul 2024 16:01:00 +0000 Subject: [PATCH 06/45] :arrow_up: Update ghcr.io/linuxserver/radarr Docker digest to 2a02b31 --- docker/arrs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 20d278c..68538ba 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -43,7 +43,7 @@ services: - PGID=1000 radarr: - image: ghcr.io/linuxserver/radarr@sha256:1eaf9e83fca2b9170d4f49f6c0e55ba38693718e7815743a9ec297d199ab1e73 + image: ghcr.io/linuxserver/radarr@sha256:2a02b311cefb344cd0caf74a443b9d6318daf15bda5280a3bc732381db983dc3 container_name: radarr ports: - "7878:7878" From 1e3a2db19c5ad5a5e821293bb98e883cec622644 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 23 Jul 2024 22:01:05 +0000 Subject: [PATCH 07/45] :arrow_up: Update ghcr.io/linuxserver/bazarr Docker digest to 25f0d19 --- docker/arrs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 20d278c..c8934c1 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -1,7 +1,7 @@ --- services: bazarr: - image: ghcr.io/linuxserver/bazarr@sha256:5da74fc1bbd5da69e3b4f9b2376f6ccfbe3b47f143e6eb5651ed37cc1d4412dd + image: ghcr.io/linuxserver/bazarr@sha256:25f0d19ba9226fdf15aec0fc7fa134ba89fc6f77f09d7bd45b33c5960c47821e container_name: bazarr ports: - "6767:6767" From e19c132f30a4d5fe30d253a87e07c579accc9e9c Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:19:23 -0400 Subject: [PATCH 08/45] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index 8bb3a22..e3d5d12 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -20,7 +20,7 @@ jobs: if [ "$(git rev-parse --is-shallow-repository)" = "true" ]; then git fetch --unshallow fi - folders=$(git diff --name-only HEAD~1 HEAD | cut -d/ -f1 | sort | uniq) + folders=$(git diff --name-only HEAD~1 HEAD | grep '^iac/docker/' | cut -d/ -f3 | sort | uniq) echo "Modified folders: $folders" echo "::set-output name=folders::$folders" @@ -83,8 +83,8 @@ jobs: -d "{\"extra_vars\": {\"target_host\": \"$target_host\", \"folder\": \"$folder\"}}" \ "https://awx.mafyuh.xyz/api/v2/job_templates/13/launch/" - sleep 45 # Delay for 45 seconds before fetching logs - + sleep 45 + job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id | jq -r '.results[0].id') logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json) echo "AWX Job Logs for folder: $folder" From 0d60994a5b8b451159df1e55ad45d108c2ad8fab Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:26:33 -0400 Subject: [PATCH 09/45] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index ce53c2d..10c770e 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -17,14 +17,10 @@ jobs: with: node-version: 14 - - name: Install yamllint - run: | - npm install -g yaml-lint - - name: Show yamllint version run: | yamllint --version - name: Lint .yml files run: | - yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" ./**/*.yml \ No newline at end of file + yamllint -d "{extends: relaxed, rules: {line-length: {max: 120}}}" docker/**/*.yml \ No newline at end of file From c3148d66041609397e74e0aa0ab0e83f997b7ee5 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:38:46 -0400 Subject: [PATCH 10/45] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index e3d5d12..c0664dc 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -20,7 +20,7 @@ jobs: if [ "$(git rev-parse --is-shallow-repository)" = "true" ]; then git fetch --unshallow fi - folders=$(git diff --name-only HEAD~1 HEAD | grep '^iac/docker/' | cut -d/ -f3 | sort | uniq) + folders=$(git diff --name-only HEAD~1 HEAD | grep '^docker/' | cut -d/ -f3 | sort | uniq) echo "Modified folders: $folders" echo "::set-output name=folders::$folders" From 31ae8971bfee4818e5383b861000c1fcef11f0fd Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:47:12 -0400 Subject: [PATCH 11/45] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index c0664dc..d442914 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -20,9 +20,25 @@ jobs: if [ "$(git rev-parse --is-shallow-repository)" = "true" ]; then git fetch --unshallow fi - folders=$(git diff --name-only HEAD~1 HEAD | grep '^docker/' | cut -d/ -f3 | sort | uniq) + folders=$(git diff --name-only HEAD~1 HEAD | grep '^docker/' | cut -d/ -f2 | sort | uniq) echo "Modified folders: $folders" - echo "::set-output name=folders::$folders" + echo "::set-output name=folders::$folders" + + - name: Set condition for deployment + id: set-condition + run: | + if [ -z "${{ steps.detect-changes.outputs.folders }}" ]; then + echo "No relevant changes detected." + echo "::set-output name=continue::false" + else + echo "Relevant changes detected." + echo "::set-output name=continue::true" + fi + + if: steps.set-condition.outputs.continue == 'true' + steps: + - name: Checkout repository + uses: actions/checkout@v4 - name: Deploy to hosts run: | @@ -94,4 +110,4 @@ jobs: echo "Absolute End: $(echo "$logs" | jq -r '.range.absolute_end')" echo "Content:" echo "$(echo "$logs" | jq -r '.content')" - done + done From 11c2c2c82de8fb4ecbca7b8e87debbb03d4f5432 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:48:22 -0400 Subject: [PATCH 12/45] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index d442914..f6640fc 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -22,7 +22,7 @@ jobs: fi folders=$(git diff --name-only HEAD~1 HEAD | grep '^docker/' | cut -d/ -f2 | sort | uniq) echo "Modified folders: $folders" - echo "::set-output name=folders::$folders" + echo "::set-output name=folders::$folders" - name: Set condition for deployment id: set-condition @@ -35,14 +35,17 @@ jobs: echo "::set-output name=continue::true" fi - if: steps.set-condition.outputs.continue == 'true' + conditional-deploy: + if: needs.deploy.outputs.continue == 'true' + runs-on: ubuntu-22.04 + needs: deploy steps: - name: Checkout repository uses: actions/checkout@v4 - name: Deploy to hosts run: | - IFS=' ' read -r -a folder_array <<< "${{ steps.detect-changes.outputs.folders }}" + IFS=' ' read -r -a folder_array <<< "${{ needs.deploy.outputs.folders }}" for folder in "${folder_array[@]}"; do case $folder in arrs) @@ -110,4 +113,4 @@ jobs: echo "Absolute End: $(echo "$logs" | jq -r '.range.absolute_end')" echo "Content:" echo "$(echo "$logs" | jq -r '.content')" - done + done From 9b9cdcdeb05c214a30c9eb63e52822062d223ff8 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:56:17 -0400 Subject: [PATCH 13/45] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index f6640fc..44d4602 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -6,7 +6,7 @@ on: jobs: deploy: if: github.event.pull_request.merged == true - runs-on: ubuntu-22.04 + runs-on: docker steps: - name: Checkout repository uses: actions/checkout@v4 From 8d6fdbcc00138459f98be2626c12e0da627e1b90 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 23 Jul 2024 21:58:14 -0400 Subject: [PATCH 14/45] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index 44d4602..0148346 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -37,7 +37,7 @@ jobs: conditional-deploy: if: needs.deploy.outputs.continue == 'true' - runs-on: ubuntu-22.04 + runs-on: docker needs: deploy steps: - name: Checkout repository From c716e543928831874f8cff852e3082af39fe6da1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 25 Jul 2024 03:01:04 +0000 Subject: [PATCH 15/45] :arrow_up: Update ghcr.io/linuxserver/sabnzbd Docker digest to d6a2a96 --- docker/downloaders/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/downloaders/docker-compose.yml b/docker/downloaders/docker-compose.yml index 7e41091..beef2a5 100644 --- a/docker/downloaders/docker-compose.yml +++ b/docker/downloaders/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.9' services: sabnzbd: - image: ghcr.io/linuxserver/sabnzbd@sha256:31ea64a7ce1e9a5ff8187f9b7c905eaa1d0a79d49b04724e47059c67407157eb + image: ghcr.io/linuxserver/sabnzbd@sha256:d6a2a967d47b495c5342bc23de76d35eeb2f3ceb53c7be51885ad25f95dffe9b container_name: sabnzbd environment: - PUID=1000 From f2fe90f4c63777993aeaa4edc1cfc014a07248c0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 27 Jul 2024 00:01:04 +0000 Subject: [PATCH 16/45] :arrow_up: Update ghcr.io/linuxserver/prowlarr Docker digest to 9a98da4 --- docker/arrs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 0fa4c92..2690fc3 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -31,7 +31,7 @@ services: - PGID=1000 prowlarr: - image: ghcr.io/linuxserver/prowlarr@sha256:7c3e7840c726828643131583514b66f38e7af29021d5a7b05ed8ed5c8ec0b596 + image: ghcr.io/linuxserver/prowlarr@sha256:9a98da4fb506278ce92c2fdbb4e08a38418dd1456e3dd8b3a1f00a42a8ec4fb0 container_name: prowlarr ports: - "9696:9696" From 50c01e9e4455c960fe24cf0d2bb57ebda1947b71 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 28 Jul 2024 09:01:11 +0000 Subject: [PATCH 17/45] :arrow_up: Update ghcr.io/linuxserver/doplarr Docker digest to 9e1cfed --- docker/arrs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 0fa4c92..17438df 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -91,7 +91,7 @@ services: - AUTH_OIDC_ADMIN_GROUP=${AUTH_OIDC_ADMIN_GROUP} doplarr: - image: ghcr.io/linuxserver/doplarr@sha256:b71ea85a718b4ed924f132c6a5e62ddef68a7f43ba137f4f30900067532a5d9a + image: ghcr.io/linuxserver/doplarr@sha256:9e1cfedf824d00bb0f269bcb3836b13cdbb74747bef062f9021be6f0f63dde7a container_name: doplarr environment: - PUID=1000 From 2fff2490a3016716a8cb84bba6f00bd0be41344b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 30 Jul 2024 00:01:18 +0000 Subject: [PATCH 18/45] :arrow_up: Update docker.mafyuh.xyz/ollama/ollama Docker tag to v0.3.1 --- docker/AI/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/AI/docker-compose.yml b/docker/AI/docker-compose.yml index c925ce4..3c8a6fc 100644 --- a/docker/AI/docker-compose.yml +++ b/docker/AI/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: ollama: - image: docker.mafyuh.xyz/ollama/ollama:0.2.6 + image: docker.mafyuh.xyz/ollama/ollama:0.3.1 container_name: ollama restart: unless-stopped volumes: From 74ac4263c9a19c528e6cb6474d640fb3ff7420b5 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Mon, 29 Jul 2024 21:10:51 -0400 Subject: [PATCH 19/45] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index e032c68..d98f9d6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,8 @@ # iac +ToDo +- [ ] Update Readme +- [ ] Migrate all containers to use this repo (DB migrations) +- [x] Get OpenTofu migrated to this repo +- [ ] Get Kubernetes repo migrated over +- [ ] Re-bootstrap Flux From 949eb7e1634584786a973ee5341579ca66056f5b Mon Sep 17 00:00:00 2001 From: mafyuh Date: Mon, 29 Jul 2024 21:13:32 -0400 Subject: [PATCH 20/45] Update terraform/README.md --- terraform/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/README.md b/terraform/README.md index 9516ef2..8239517 100644 --- a/terraform/README.md +++ b/terraform/README.md @@ -3,7 +3,7 @@
-# IaC-Homelab +# IaC Infrastructure as Code (IaC) for my homelab using OpenTofu. From ee5b607785513a5544c4c0f3b6a5416a9e580e89 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 20:17:39 -0400 Subject: [PATCH 21/45] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index 0148346..dd619a4 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -6,7 +6,7 @@ on: jobs: deploy: if: github.event.pull_request.merged == true - runs-on: docker + runs-on: ubuntu-22.04 steps: - name: Checkout repository uses: actions/checkout@v4 @@ -22,30 +22,11 @@ jobs: fi folders=$(git diff --name-only HEAD~1 HEAD | grep '^docker/' | cut -d/ -f2 | sort | uniq) echo "Modified folders: $folders" - echo "::set-output name=folders::$folders" - - - name: Set condition for deployment - id: set-condition - run: | - if [ -z "${{ steps.detect-changes.outputs.folders }}" ]; then - echo "No relevant changes detected." - echo "::set-output name=continue::false" - else - echo "Relevant changes detected." - echo "::set-output name=continue::true" - fi - - conditional-deploy: - if: needs.deploy.outputs.continue == 'true' - runs-on: docker - needs: deploy - steps: - - name: Checkout repository - uses: actions/checkout@v4 + echo "::set-output name=folders::$folders" - name: Deploy to hosts run: | - IFS=' ' read -r -a folder_array <<< "${{ needs.deploy.outputs.folders }}" + IFS=' ' read -r -a folder_array <<< "${{ steps.detect-changes.outputs.folders }}" for folder in "${folder_array[@]}"; do case $folder in arrs) @@ -102,8 +83,8 @@ jobs: -d "{\"extra_vars\": {\"target_host\": \"$target_host\", \"folder\": \"$folder\"}}" \ "https://awx.mafyuh.xyz/api/v2/job_templates/13/launch/" - sleep 45 - + sleep 45 # Delay for 45 seconds before fetching logs + job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id | jq -r '.results[0].id') logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json) echo "AWX Job Logs for folder: $folder" @@ -113,4 +94,4 @@ jobs: echo "Absolute End: $(echo "$logs" | jq -r '.range.absolute_end')" echo "Content:" echo "$(echo "$logs" | jq -r '.content')" - done + done From 01bf777f5cb23bcd2a4e4dd9f74c1ea6ded902f8 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 20:20:04 -0400 Subject: [PATCH 22/45] Add ansible/playbooks/deploy-docker.yml --- ansible/playbooks/deploy-docker.yml | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 ansible/playbooks/deploy-docker.yml diff --git a/ansible/playbooks/deploy-docker.yml b/ansible/playbooks/deploy-docker.yml new file mode 100644 index 0000000..da06f3c --- /dev/null +++ b/ansible/playbooks/deploy-docker.yml @@ -0,0 +1,33 @@ +--- +- name: Deploy application + hosts: "{{ target_host }}" + vars: + repo_path: "/home/{{ ansible_user }}/iac/{{ folder }}" + tasks: + - name: Ensure the repository is up-to-date + shell: git pull + args: + chdir: "{{ repo_path }}" + register: git_pull_output + + - name: Display git pull output + debug: + var: git_pull_output.stdout_lines + + - name: Restart services + command: docker compose up -d + args: + chdir: "{{ repo_path }}" + register: docker_compose_output + + - name: Display docker output + debug: + var: docker_compose_output.stdout_lines + + - name: Run Docker Command + command: docker ps + register: docker_output + + - name: Display Docker Output + debug: + var: docker_output.stdout_lines From 718188d5735678af783d978f1a0bd04bce6aa3c6 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 20:24:14 -0400 Subject: [PATCH 23/45] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d98f9d6..62f0588 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # iac +Currently migrating [Auto-Homelab](https://git.mafyuh.dev/mafyuh/Auto-Homelab), [Iac-Homelab](https://git.mafyuh.dev/mafyuh/IaC-Homelab), [ansible-playbooks](https://git.mafyuh.dev/mafyuh/ansible-playbooks) and [kub](https://git.mafyuh.dev/mafyuh/kub) repos into this one. ToDo - [ ] Update Readme @@ -6,3 +7,4 @@ ToDo - [x] Get OpenTofu migrated to this repo - [ ] Get Kubernetes repo migrated over - [ ] Re-bootstrap Flux + From fdb00df7c44c8e716e717111ade0d254338757fa Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 20:29:19 -0400 Subject: [PATCH 24/45] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index dd619a4..cfebdd5 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -6,7 +6,7 @@ on: jobs: deploy: if: github.event.pull_request.merged == true - runs-on: ubuntu-22.04 + runs-on: docker steps: - name: Checkout repository uses: actions/checkout@v4 From 7bca24ef86438721ca786db2d25515269a86c1eb Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 20:33:00 -0400 Subject: [PATCH 25/45] Update ansible/playbooks/deploy-docker.yml --- ansible/playbooks/deploy-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/playbooks/deploy-docker.yml b/ansible/playbooks/deploy-docker.yml index da06f3c..728d41d 100644 --- a/ansible/playbooks/deploy-docker.yml +++ b/ansible/playbooks/deploy-docker.yml @@ -2,7 +2,7 @@ - name: Deploy application hosts: "{{ target_host }}" vars: - repo_path: "/home/{{ ansible_user }}/iac/{{ folder }}" + repo_path: "/home/{{ ansible_user }}/iac/docker/{{ folder }}" tasks: - name: Ensure the repository is up-to-date shell: git pull From 28e4391c852eb5ecc80638c1ba260c2d008282bc Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 20:37:04 -0400 Subject: [PATCH 26/45] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index cfebdd5..ebde206 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -6,7 +6,7 @@ on: jobs: deploy: if: github.event.pull_request.merged == true - runs-on: docker + runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v4 @@ -85,13 +85,10 @@ jobs: sleep 45 # Delay for 45 seconds before fetching logs - job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id | jq -r '.results[0].id') - logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json) + job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" "https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id" | grep -oP '"id":\s*\K[0-9]+') + logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" "https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json") + echo "AWX Job Logs for folder: $folder" - echo "Range:" - echo "Start: $(echo "$logs" | jq -r '.range.start')" - echo "End: $(echo "$logs" | jq -r '.range.end')" - echo "Absolute End: $(echo "$logs" | jq -r '.range.absolute_end')" echo "Content:" - echo "$(echo "$logs" | jq -r '.content')" - done + echo "$logs" | grep -oP '"content":\s*"\K[^"]+' | sed 's/\\n/\n/g' + done From 849a40395a630fa19a8f4595011274a4debb392c Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 20:37:13 -0400 Subject: [PATCH 27/45] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index ebde206..e363232 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -6,7 +6,7 @@ on: jobs: deploy: if: github.event.pull_request.merged == true - runs-on: ubuntu-latest + runs-on: docker steps: - name: Checkout repository uses: actions/checkout@v4 From b54d500f79b903c7265e81b3de12678518d4ef2e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 31 Jul 2024 01:01:10 +0000 Subject: [PATCH 28/45] :arrow_up: Update ghcr.io/linuxserver/radarr Docker digest to 9d6f054 --- docker/arrs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index a3fd699..5cf1523 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -43,7 +43,7 @@ services: - PGID=1000 radarr: - image: ghcr.io/linuxserver/radarr@sha256:2a02b311cefb344cd0caf74a443b9d6318daf15bda5280a3bc732381db983dc3 + image: ghcr.io/linuxserver/radarr@sha256:9d6f0548fd805edb30108fdd06d0fc5a4436c9bd708b57bd4119d7aefa815fe4 container_name: radarr ports: - "7878:7878" From 96920d0219d5270446fd93377914e9e58cb2146a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 31 Jul 2024 01:14:00 +0000 Subject: [PATCH 29/45] :arrow_up: Update ghcr.io/linuxserver/bazarr Docker digest to e70de8a --- docker/arrs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 5cf1523..566423d 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -1,7 +1,7 @@ --- services: bazarr: - image: ghcr.io/linuxserver/bazarr@sha256:25f0d19ba9226fdf15aec0fc7fa134ba89fc6f77f09d7bd45b33c5960c47821e + image: ghcr.io/linuxserver/bazarr@sha256:e70de8a714ac57395d45052392001ec433b8f48aa1c204f13dae312cbcbe43af container_name: bazarr ports: - "6767:6767" From 00a231f4c5b4f499a2145627e13cc80d88163266 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 31 Jul 2024 01:14:01 +0000 Subject: [PATCH 30/45] :arrow_up: Update ghcr.io/linuxserver/jellyfin Docker digest to eadf16c --- docker/jellyfin/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/jellyfin/docker-compose.yml b/docker/jellyfin/docker-compose.yml index a5fa894..da052e4 100644 --- a/docker/jellyfin/docker-compose.yml +++ b/docker/jellyfin/docker-compose.yml @@ -1,7 +1,7 @@ --- services: jellyfin: - image: ghcr.io/linuxserver/jellyfin@sha256:843878f35dc700e502798b39edb24b84b7b7ff0788f1b7b9b1e71d4f8d34f951 + image: ghcr.io/linuxserver/jellyfin@sha256:eadf16cadd823a5cbe1b92750ee74111f9b2cac894834477ab4a43a5fc835ebe container_name: jellyfin devices: - /dev/dri/renderD129:/dev/dri/renderD129 From 96eb0fdf5cff3ddfc14782b0a1f6ef60cc8f2c50 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 31 Jul 2024 01:14:05 +0000 Subject: [PATCH 31/45] :arrow_up: Update ghcr.io/linuxserver/syncthing Docker digest to 84e9cd9 --- docker/arm/docker-compose.yml | 2 +- docker/arrs/docker-compose.yml | 2 +- docker/jellyfin/docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index 2af0c40..591cbee 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -137,7 +137,7 @@ services: ipv4_address: 172.25.0.25 syncthing: - image: ghcr.io/linuxserver/syncthing@sha256:6fb87abe19730aad01b6511d660a0664be424986ae662b85eb76f0ce585c4890 + image: ghcr.io/linuxserver/syncthing@sha256:84e9cd99d247d6ef31fc8c1a6967f068a8352a530095bb402bf3bb298aa10696 container_name: syncthing hostname: ARM #optional environment: diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 5cf1523..a2dc69d 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -140,7 +140,7 @@ services: image: gcr.io/cadvisor/cadvisor:v0.49.1 syncthing: - image: ghcr.io/linuxserver/syncthing@sha256:6fb87abe19730aad01b6511d660a0664be424986ae662b85eb76f0ce585c4890 + image: ghcr.io/linuxserver/syncthing@sha256:84e9cd99d247d6ef31fc8c1a6967f068a8352a530095bb402bf3bb298aa10696 container_name: syncthing hostname: ARRS environment: diff --git a/docker/jellyfin/docker-compose.yml b/docker/jellyfin/docker-compose.yml index a5fa894..9cbaceb 100644 --- a/docker/jellyfin/docker-compose.yml +++ b/docker/jellyfin/docker-compose.yml @@ -35,7 +35,7 @@ services: privileged: true syncthing: - image: ghcr.io/linuxserver/syncthing@sha256:6fb87abe19730aad01b6511d660a0664be424986ae662b85eb76f0ce585c4890 + image: ghcr.io/linuxserver/syncthing@sha256:84e9cd99d247d6ef31fc8c1a6967f068a8352a530095bb402bf3bb298aa10696 container_name: syncthing hostname: JF environment: From 9d15a6cd2adbc9133a46b895fbcf094ca5517c16 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 31 Jul 2024 01:14:16 +0000 Subject: [PATCH 32/45] :arrow_up: Update codeberg.org/forgejo/forgejo Docker tag to v8 --- docker/arm/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index 2af0c40..7b97ef3 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -1,7 +1,7 @@ --- services: server: - image: codeberg.org/forgejo/forgejo:7.0.5 + image: codeberg.org/forgejo/forgejo:8.0.0 container_name: forgejo environment: - USER_UID=1000 From a386b35517fb25dd2f0d1d6f19dd0b9707db6b66 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 22:13:47 -0400 Subject: [PATCH 33/45] Update .forgejo/workflows/CD.yml --- .forgejo/workflows/CD.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/CD.yml b/.forgejo/workflows/CD.yml index e363232..7bf27e1 100644 --- a/.forgejo/workflows/CD.yml +++ b/.forgejo/workflows/CD.yml @@ -14,6 +14,10 @@ jobs: - name: Fetch all history for git diff run: git fetch --depth=2 + - name: Install jq + run: | + apt-get update && apt-get install -y jq + - name: Detect modified folders id: detect-changes run: | @@ -85,10 +89,13 @@ jobs: sleep 45 # Delay for 45 seconds before fetching logs - job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" "https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id" | grep -oP '"id":\s*\K[0-9]+') - logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" "https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json") - + job_id=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/job_templates/13/jobs/?order_by=-id | jq -r '.results[0].id') + logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json) echo "AWX Job Logs for folder: $folder" + echo "Range:" + echo "Start: $(echo "$logs" | jq -r '.range.start')" + echo "End: $(echo "$logs" | jq -r '.range.end')" + echo "Absolute End: $(echo "$logs" | jq -r '.range.absolute_end')" echo "Content:" - echo "$logs" | grep -oP '"content":\s*"\K[^"]+' | sed 's/\\n/\n/g' + echo "$(echo "$logs" | jq -r '.content')" done From a0d9eecebacc783f8a16e20cabf20ad806d4cd81 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 22:21:22 -0400 Subject: [PATCH 34/45] Update docker/AI/docker-compose.yml --- docker/AI/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/AI/docker-compose.yml b/docker/AI/docker-compose.yml index 3c8a6fc..ed0ede0 100644 --- a/docker/AI/docker-compose.yml +++ b/docker/AI/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: ollama: - image: docker.mafyuh.xyz/ollama/ollama:0.3.1 + image: ollama/ollama:0.3.1 container_name: ollama restart: unless-stopped volumes: @@ -29,7 +29,7 @@ services: - host.docker.internal:host-gateway mindsdb: - image: docker.mafyuh.xyz/mindsdb/mindsdb:v24.7.3.0 + image: mindsdb/mindsdb:v24.7.3.0 container_name: mindsdb ports: - 47334:47334 From b2bcd3f90d77e68e7eb987c925118a668da44cff Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 22:31:10 -0400 Subject: [PATCH 35/45] Delete docker/pages/docker-compose.yml --- docker/pages/docker-compose.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 docker/pages/docker-compose.yml diff --git a/docker/pages/docker-compose.yml b/docker/pages/docker-compose.yml deleted file mode 100644 index 7e7aec4..0000000 --- a/docker/pages/docker-compose.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -services: - pages: - image: codeberg.org/codeberg/pages-server:v5.1 - container_name: codeberg-pages - environment: - - GITEA_ROOT=https://git.mafyuh.dev - - GITEA_API_TOKEN=$GITEA_API_TOKEN - - ACME_ACCEPT_TERMS=true - - CLOUDFLARE_EMAIL=$CLOUDFLARE_EMAIL - - CLOUDFLARE_API_KEY=$CLOUDFLARE_API_KEY - - DNS_PROVIDER=cloudflare - - PAGES_DOMAIN=mafyuh.co - - CF_ZONE_API_TOKEN=$CF_ZONE_API_TOKEN - - CF_DNS_API_TOKEN=$CF_DNS_API_TOKEN - - ENABLE_HTTP_SERVER=false - ports: - - "80:80" - - "443:443" - volumes: - - /home/ubuntu/pages/datanew:/data From b9753a2c14472cc8192631cfb8111aff90138f2e Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 22:43:23 -0400 Subject: [PATCH 36/45] Update docker/README.md --- docker/README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docker/README.md b/docker/README.md index 4a6f829..da46b6d 100644 --- a/docker/README.md +++ b/docker/README.md @@ -5,8 +5,6 @@ ![Header Image](https://raw.githubusercontent.com/Mafyuh/homelab-svg-assets/main/assets/header_.png)
-# Auto-Homelab - Homelab docker-compose environment defined in code. Using Forgejo Actions and Renovate bot for CI, AWX Tower and Forgejo Actions for CD. This is how I keep my Homelab UTD.
@@ -305,8 +303,4 @@ graph TD P --> Q -``` - -## To-Do - -[View Project Board](https://git.mafyuh.dev/mafyuh/Auto-Homelab/projects/1) \ No newline at end of file +``` \ No newline at end of file From a50502381b7631af7f4d114da8d04b1e48617369 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 22:44:04 -0400 Subject: [PATCH 37/45] Update docker/README.md --- docker/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/README.md b/docker/README.md index da46b6d..f219485 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,7 +1,7 @@ -[![Yamllint](https://git.mafyuh.dev/mafyuh/Auto-Homelab/badges/workflows/yamllint.yml/badge.svg)](https://git.mafyuh.dev/mafyuh/Auto-Homelab/actions) -[![Yamllint](https://git.mafyuh.dev/mafyuh/Auto-Homelab/badges/workflows/CD.yml/badge.svg)](https://git.mafyuh.dev/mafyuh/Auto-Homelab/actions) +[![Yamllint](https://git.mafyuh.dev/mafyuh/iac/badges/workflows/yamllint.yml/badge.svg)](https://git.mafyuh.dev/mafyuh/iac/actions) +[![Yamllint](https://git.mafyuh.dev/mafyuh/iac/badges/workflows/CD.yml/badge.svg)](https://git.mafyuh.dev/mafyuh/iac/actions) [![Renovate](https://git.mafyuh.dev/renovatebot/renovate/badges/workflows/renovate.yml/badge.svg)](https://git.mafyuh.dev/renovatebot/renovate/actions) -[![Pulls](https://git.mafyuh.dev/mafyuh/Auto-Homelab/badges/pulls.svg)](https://git.mafyuh.dev/mafyuh/Auto-Homelab/pulls) +[![Pulls](https://git.mafyuh.dev/mafyuh/iac/badges/pulls.svg)](https://git.mafyuh.dev/mafyuh/iac/pulls) ![Header Image](https://raw.githubusercontent.com/Mafyuh/homelab-svg-assets/main/assets/header_.png)
@@ -9,7 +9,7 @@ Homelab docker-compose environment defined in code. Using Forgejo Actions and Re

- Wiki | + Wiki | How to Setup | Blog | Inspiration | From 6fa71fa56cd776132a4ca02fd2701dd39eb293e2 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Tue, 30 Jul 2024 22:44:54 -0400 Subject: [PATCH 38/45] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 62f0588..61d6502 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Currently migrating [Auto-Homelab](https://git.mafyuh.dev/mafyuh/Auto-Homelab), ToDo - [ ] Update Readme -- [ ] Migrate all containers to use this repo (DB migrations) +- [x] Migrate all containers to use this repo (DB migrations) - [x] Get OpenTofu migrated to this repo - [ ] Get Kubernetes repo migrated over - [ ] Re-bootstrap Flux From fd9ad60b550f264f85f0993c3ca19419a04679a7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 31 Jul 2024 03:00:36 +0000 Subject: [PATCH 39/45] :arrow_up: Update ghcr.io/linuxserver/lidarr Docker digest to 5855582 --- docker/arrs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 7b578c6..64650ae 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -15,7 +15,7 @@ services: - PGID=1000 lidarr: - image: ghcr.io/linuxserver/lidarr@sha256:3c093803236a9f694f805392a5d6461b550f70b3f9cf4be0bc73b3428e3dbe90 + image: ghcr.io/linuxserver/lidarr@sha256:5855582eee07024c2584c01aaf955901303162bf00de183a1fbf2e9b81041695 container_name: lidarr ports: - "8686:8686" From 5aa4ea2c617eef69cbcc4465d539d68892264f67 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 31 Jul 2024 03:00:38 +0000 Subject: [PATCH 40/45] :arrow_up: Update mindsdb/mindsdb Docker tag to v24.7.5.0 --- docker/AI/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/AI/docker-compose.yml b/docker/AI/docker-compose.yml index ed0ede0..e713044 100644 --- a/docker/AI/docker-compose.yml +++ b/docker/AI/docker-compose.yml @@ -29,7 +29,7 @@ services: - host.docker.internal:host-gateway mindsdb: - image: mindsdb/mindsdb:v24.7.3.0 + image: mindsdb/mindsdb:v24.7.5.0 container_name: mindsdb ports: - 47334:47334 From 3bd08963618a8ed50bcc01f3918290ad0f76ab46 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 31 Jul 2024 04:01:01 +0000 Subject: [PATCH 41/45] :arrow_up: Update ghcr.io/linuxserver/prowlarr Docker digest to 7fe5756 --- docker/arrs/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arrs/docker-compose.yml b/docker/arrs/docker-compose.yml index 7b578c6..f70825d 100644 --- a/docker/arrs/docker-compose.yml +++ b/docker/arrs/docker-compose.yml @@ -31,7 +31,7 @@ services: - PGID=1000 prowlarr: - image: ghcr.io/linuxserver/prowlarr@sha256:9a98da4fb506278ce92c2fdbb4e08a38418dd1456e3dd8b3a1f00a42a8ec4fb0 + image: ghcr.io/linuxserver/prowlarr@sha256:7fe57565907f4f776d43c15b2e020a0e4a62fe1e04e80e25b85a3ae4ca49e5d0 container_name: prowlarr ports: - "9696:9696" From 1dba59590b489dc71d022cd9c2b297c9fc8d2e32 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 31 Jul 2024 07:00:35 +0000 Subject: [PATCH 42/45] :arrow_up: Update ghcr.io/linuxserver/adguardhome-sync Docker digest to c6bad81 --- docker/ag-main/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/ag-main/docker-compose.yml b/docker/ag-main/docker-compose.yml index 157303f..a212357 100644 --- a/docker/ag-main/docker-compose.yml +++ b/docker/ag-main/docker-compose.yml @@ -22,7 +22,7 @@ services: - 5443:5443/udp adguardhome-sync: - image: ghcr.io/linuxserver/adguardhome-sync@sha256:ee2ddd62c61d13e01da7f96135d1438376a22992c7d9951b2429bb2cfd64a05a + image: ghcr.io/linuxserver/adguardhome-sync@sha256:c6bad810acfc292b9220936751194f6ae9800b1228385ae8f2130fba280b79ee container_name: adguardhome-sync environment: - PUID=1000 From 54f3aa882b27ae027e42ab453e6dd1fbd8227594 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 31 Jul 2024 13:00:39 +0000 Subject: [PATCH 43/45] :arrow_up: Update ghcr.io/n8n-io/n8n Docker tag to v1.52.2 --- docker/arm/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index cd6df36..ec3c28c 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -107,7 +107,7 @@ services: networks: - gitea_main n8n: - image: ghcr.io/n8n-io/n8n:1.51.0 + image: ghcr.io/n8n-io/n8n:1.52.2 container_name: n8n ports: - 5678:5678 From ed050b72382b191b167efa68962c4d19ec6746ca Mon Sep 17 00:00:00 2001 From: mafyuh Date: Wed, 31 Jul 2024 09:24:09 -0400 Subject: [PATCH 44/45] Update .forgejo/workflows/yamllint.yml --- .forgejo/workflows/yamllint.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.forgejo/workflows/yamllint.yml b/.forgejo/workflows/yamllint.yml index 10c770e..908ecba 100644 --- a/.forgejo/workflows/yamllint.yml +++ b/.forgejo/workflows/yamllint.yml @@ -16,6 +16,10 @@ jobs: uses: actions/setup-node@v4 with: node-version: 14 + + - name: Install yamllint + run: | + npm install -g yaml-lint - name: Show yamllint version run: | From 21aef10f0b849c8f7df51c3bae729a99128afa3d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 31 Jul 2024 16:00:35 +0000 Subject: [PATCH 45/45] :arrow_up: Update ghcr.io/goauthentik/server Docker digest to a98f955 --- docker/authentik/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/authentik/docker-compose.yml b/docker/authentik/docker-compose.yml index ed049d2..e70cf5b 100644 --- a/docker/authentik/docker-compose.yml +++ b/docker/authentik/docker-compose.yml @@ -32,7 +32,7 @@ services: volumes: - redis:/data server: - image: ghcr.io/goauthentik/server@sha256:f79b6cf35b29a8591136afb633ddd46da303e9cd2ca82c7cdfbd020a780e15e8 + image: ghcr.io/goauthentik/server@sha256:a98f95518269d01bb812eb0e12c6647f3d08a36e37b9fdbdccf9345d4431b9f0 restart: unless-stopped command: server environment: @@ -53,7 +53,7 @@ services: - postgresql - redis worker: - image: ghcr.io/goauthentik/server@sha256:f79b6cf35b29a8591136afb633ddd46da303e9cd2ca82c7cdfbd020a780e15e8 + image: ghcr.io/goauthentik/server@sha256:a98f95518269d01bb812eb0e12c6647f3d08a36e37b9fdbdccf9345d4431b9f0 restart: unless-stopped command: worker environment: