Skip to content

Commit 3bb4522

Browse files
author
Matt Reeves
committedAug 1, 2024
Merge branch 'main' into renovate/ghcr.io-linuxserver-kasm
2 parents 2e7efa9 + 30e61eb commit 3bb4522

File tree

16 files changed

+44
-4295
lines changed

16 files changed

+44
-4295
lines changed
 

‎.forgejo/workflows/CD.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ jobs:
1414
- name: Fetch all history for git diff
1515
run: git fetch --depth=2
1616

17+
- name: Install jq
18+
run: |
19+
apt-get update && apt-get install -y jq
20+
1721
- name: Detect modified folders
1822
id: detect-changes
1923
run: |
@@ -85,10 +89,13 @@ jobs:
8589
8690
sleep 45 # Delay for 45 seconds before fetching logs
8791
88-
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]+')
89-
logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" "https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json")
90-
92+
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')
93+
logs=$(curl -s -H "Authorization: Bearer ${{ secrets.AWX_API_TOKEN }}" https://awx.mafyuh.xyz/api/v2/jobs/$job_id/stdout/?format=json)
9194
echo "AWX Job Logs for folder: $folder"
95+
echo "Range:"
96+
echo "Start: $(echo "$logs" | jq -r '.range.start')"
97+
echo "End: $(echo "$logs" | jq -r '.range.end')"
98+
echo "Absolute End: $(echo "$logs" | jq -r '.range.absolute_end')"
9299
echo "Content:"
93-
echo "$logs" | grep -oP '"content":\s*"\K[^"]+' | sed 's/\\n/\n/g'
100+
echo "$(echo "$logs" | jq -r '.content')"
94101
done

‎.forgejo/workflows/yamllint.yml

+4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ jobs:
1616
uses: actions/setup-node@v4
1717
with:
1818
node-version: 14
19+
20+
- name: Install yamllint
21+
run: |
22+
npm install -g yaml-lint
1923
2024
- name: Show yamllint version
2125
run: |

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Currently migrating [Auto-Homelab](https://git.mafyuh.dev/mafyuh/Auto-Homelab),
33

44
ToDo
55
- [ ] Update Readme
6-
- [ ] Migrate all containers to use this repo (DB migrations)
6+
- [x] Migrate all containers to use this repo (DB migrations)
77
- [x] Get OpenTofu migrated to this repo
88
- [ ] Get Kubernetes repo migrated over
99
- [ ] Re-bootstrap Flux

‎docker/AI/docker-compose.yml

+2-2
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.2.6
5+
image: ollama/ollama:0.3.1
66
container_name: ollama
77
restart: unless-stopped
88
volumes:
@@ -29,7 +29,7 @@ services:
2929
- host.docker.internal:host-gateway
3030

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

‎docker/README.md

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
[![Yamllint](https://git.mafyuh.dev/mafyuh/Auto-Homelab/badges/workflows/yamllint.yml/badge.svg)](https://git.mafyuh.dev/mafyuh/Auto-Homelab/actions)
2-
[![Yamllint](https://git.mafyuh.dev/mafyuh/Auto-Homelab/badges/workflows/CD.yml/badge.svg)](https://git.mafyuh.dev/mafyuh/Auto-Homelab/actions)
1+
[![Yamllint](https://git.mafyuh.dev/mafyuh/iac/badges/workflows/yamllint.yml/badge.svg)](https://git.mafyuh.dev/mafyuh/iac/actions)
2+
[![Yamllint](https://git.mafyuh.dev/mafyuh/iac/badges/workflows/CD.yml/badge.svg)](https://git.mafyuh.dev/mafyuh/iac/actions)
33
[![Renovate](https://git.mafyuh.dev/renovatebot/renovate/badges/workflows/renovate.yml/badge.svg)](https://git.mafyuh.dev/renovatebot/renovate/actions)
4-
[![Pulls](https://git.mafyuh.dev/mafyuh/Auto-Homelab/badges/pulls.svg)](https://git.mafyuh.dev/mafyuh/Auto-Homelab/pulls)
4+
[![Pulls](https://git.mafyuh.dev/mafyuh/iac/badges/pulls.svg)](https://git.mafyuh.dev/mafyuh/iac/pulls)
55
![Header Image](https://raw.githubusercontent.com/Mafyuh/homelab-svg-assets/main/assets/header_.png)
66
<div align="center">
77

8-
# Auto-Homelab
9-
108
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.
119

1210
</div>
1311
<p align="center">
14-
<a href="https://git.mafyuh.dev/mafyuh/Auto-Homelab/wiki">Wiki</a> |
12+
<a href="https://git.mafyuh.dev/mafyuh/iac/wiki">Wiki</a> |
1513
<a href="https://loganmarchione.com/2022/10/how-to-run-renovate-on-a-self-hosted-gitea-and-drone-instance/">How to Setup</a> |
1614
<a href="https://mafyuh.com">Blog</a> |
1715
<a href="https://www.youtube.com/watch?v=5CkCr9U_Q1Y">Inspiration</a> |
@@ -305,8 +303,4 @@ graph TD
305303
P --> Q
306304
307305
308-
```
309-
310-
## To-Do
311-
312-
[View Project Board](https://git.mafyuh.dev/mafyuh/Auto-Homelab/projects/1)
306+
```

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
- 5443:5443/udp
2323

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

‎docker/arm/docker-compose.yml

+3-3
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.5
4+
image: codeberg.org/forgejo/forgejo:8.0.0
55
container_name: forgejo
66
environment:
77
- USER_UID=1000
@@ -107,7 +107,7 @@ services:
107107
networks:
108108
- gitea_main
109109
n8n:
110-
image: ghcr.io/n8n-io/n8n:1.51.0
110+
image: ghcr.io/n8n-io/n8n:1.53.0
111111
container_name: n8n
112112
ports:
113113
- 5678:5678
@@ -137,7 +137,7 @@ services:
137137
ipv4_address: 172.25.0.25
138138

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

‎docker/arrs/docker-compose.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
bazarr:
4-
image: ghcr.io/linuxserver/bazarr@sha256:25f0d19ba9226fdf15aec0fc7fa134ba89fc6f77f09d7bd45b33c5960c47821e
4+
image: ghcr.io/linuxserver/bazarr@sha256:e70de8a714ac57395d45052392001ec433b8f48aa1c204f13dae312cbcbe43af
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:3c093803236a9f694f805392a5d6461b550f70b3f9cf4be0bc73b3428e3dbe90
18+
image: ghcr.io/linuxserver/lidarr@sha256:5855582eee07024c2584c01aaf955901303162bf00de183a1fbf2e9b81041695
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:9a98da4fb506278ce92c2fdbb4e08a38418dd1456e3dd8b3a1f00a42a8ec4fb0
34+
image: ghcr.io/linuxserver/prowlarr@sha256:7fe57565907f4f776d43c15b2e020a0e4a62fe1e04e80e25b85a3ae4ca49e5d0
3535
container_name: prowlarr
3636
ports:
3737
- "9696:9696"
@@ -137,10 +137,10 @@ services:
137137
privileged: true
138138
devices:
139139
- /dev/kmsg
140-
image: gcr.io/cadvisor/cadvisor:v0.49.1
140+
image: gcr.io/cadvisor/cadvisor:v0.50.0
141141

142142
syncthing:
143-
image: ghcr.io/linuxserver/syncthing@sha256:6fb87abe19730aad01b6511d660a0664be424986ae662b85eb76f0ce585c4890
143+
image: ghcr.io/linuxserver/syncthing@sha256:84e9cd99d247d6ef31fc8c1a6967f068a8352a530095bb402bf3bb298aa10696
144144
container_name: syncthing
145145
hostname: ARRS
146146
environment:

‎docker/authentik/docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
volumes:
3333
- redis:/data
3434
server:
35-
image: ghcr.io/goauthentik/server@sha256:f79b6cf35b29a8591136afb633ddd46da303e9cd2ca82c7cdfbd020a780e15e8
35+
image: ghcr.io/goauthentik/server@sha256:a98f95518269d01bb812eb0e12c6647f3d08a36e37b9fdbdccf9345d4431b9f0
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:f79b6cf35b29a8591136afb633ddd46da303e9cd2ca82c7cdfbd020a780e15e8
56+
image: ghcr.io/goauthentik/server@sha256:a98f95518269d01bb812eb0e12c6647f3d08a36e37b9fdbdccf9345d4431b9f0
5757
restart: unless-stopped
5858
command: worker
5959
environment:

‎docker/downloaders/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ services:
6969
privileged: true
7070
devices:
7171
- /dev/kmsg
72-
image: gcr.io/cadvisor/cadvisor:v0.49.1
72+
image: gcr.io/cadvisor/cadvisor:v0.50.0
7373

7474
node-exporter:
7575
image: docker.mafyuh.xyz/prom/node-exporter:v1.8.2

‎docker/jellyfin/docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
jellyfin:
4-
image: ghcr.io/linuxserver/jellyfin@sha256:843878f35dc700e502798b39edb24b84b7b7ff0788f1b7b9b1e71d4f8d34f951
4+
image: ghcr.io/linuxserver/jellyfin@sha256:eadf16cadd823a5cbe1b92750ee74111f9b2cac894834477ab4a43a5fc835ebe
55
container_name: jellyfin
66
devices:
77
- /dev/dri/renderD129:/dev/dri/renderD129
@@ -35,7 +35,7 @@ services:
3535
privileged: true
3636

3737
syncthing:
38-
image: ghcr.io/linuxserver/syncthing@sha256:6fb87abe19730aad01b6511d660a0664be424986ae662b85eb76f0ce585c4890
38+
image: ghcr.io/linuxserver/syncthing@sha256:84e9cd99d247d6ef31fc8c1a6967f068a8352a530095bb402bf3bb298aa10696
3939
container_name: syncthing
4040
hostname: JF
4141
environment:

‎docker/netboot/docker-compose.yml

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

‎docker/pages/docker-compose.yml

-21
This file was deleted.

‎docker/scripts/CD.json

-4,167
This file was deleted.

‎docker/scripts/README.md

-74
This file was deleted.

‎terraform/cloud-init.tf

+6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ resource "proxmox_virtual_environment_file" "cloud_config" {
2828
- systemctl start qemu-guest-agent
2929
- curl -fsSL https://get.docker.com | sudo sh
3030
- su - mafyuh -c 'git clone https://git.mafyuh.dev/mafyuh/iac.git /home/mafyuh/iac'
31+
- su - mafyuh -c 'git config --global user.name "Mafyuh"'
32+
- su - mafyuh -c 'git config --global user.email "matt@mafyuh.com"'
33+
- su - mafyuh -c 'echo "alias dcu=\'docker compose up -d\'" >> /home/mafyuh/.bashrc
34+
- su - mafyuh -c 'echo "alias dcd=\'docker compose down\'" >> /home/mafyuh/.bashrc
3135
- echo "done" > /tmp/cloud-config.done
3236
EOF
3337

@@ -63,6 +67,8 @@ resource "proxmox_virtual_environment_file" "cloud_config2" {
6367
- su - mafyuh -c 'git clone https://git.mafyuh.dev/mafyuh/iac.git /home/mafyuh/iac'
6468
- su - mafyuh -c 'git config --global user.name "Mafyuh"'
6569
- su - mafyuh -c 'git config --global user.email "matt@mafyuh.com"'
70+
- su - mafyuh -c 'echo "alias dcu=\'docker compose up -d\'" >> /home/mafyuh/.bashrc
71+
- su - mafyuh -c 'echo "alias dcd=\'docker compose down\'" >> /home/mafyuh/.bashrc
6672
- echo "done" > /tmp/cloud-config.done
6773
EOF
6874

0 commit comments

Comments
 (0)
Please sign in to comment.