Merge branch 'main' into renovate/ghcr.io-linuxserver-netbootxyz

docker/ag-backup/docker-compose.yml

@@ -1,7 +1,7 @@
 ---
 services:
   adguardhome:
-    image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.52
+    image: adguard/adguardhome:v0.107.52
     container_name: adguardhome
     restart: unless-stopped
     volumes:

docker/ag-main/docker-compose.yml

@@ -1,7 +1,7 @@
 ---
 services:
   adguardhome:
-    image: docker.mafyuh.xyz/adguard/adguardhome:v0.107.52
+    image: adguard/adguardhome:v0.107.52
     container_name: adguardhome
     restart: unless-stopped
     volumes:

docker/arm/docker-compose.yml

@@ -38,7 +38,7 @@ services:
       - /home/ubuntu/forgejo/mysql:/var/lib/mysql
 
   gotify:
-    image: docker.mafyuh.xyz/gotify/server-arm7:2.5.0
+    image: 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.3
+    image: jc21/nginx-proxy-manager:2.11.3
     container_name: nginx-proxy-manager
     ports:
       - 80:80
@@ -67,7 +67,7 @@ services:
       - gitea_main
 
   uptime-kuma:
-    image: docker.mafyuh.xyz/louislam/uptime-kuma:1.23.13
+    image: louislam/uptime-kuma:1.23.13
     container_name: uptime-kuma
     ports:
       - 3001:3001
@@ -78,7 +78,7 @@ services:
       - gitea_main
 
   jellyseerr:
-    image: docker.mafyuh.xyz/fallenbagel/jellyseerr:1.9.2
+    image: fallenbagel/jellyseerr:1.9.2
     container_name: jellyseerr
     ports:
       - 5055:5055
@@ -92,7 +92,7 @@ services:
       - gitea_main
 
   linkstack:
-    image: docker.mafyuh.xyz/linkstackorg/linkstack@sha256:ad2ec7ffa69f4b04367313d1b95566bb00955b9670eb5467fd4fab39dd1f53c1
+    image: linkstackorg/linkstack@sha256:ad2ec7ffa69f4b04367313d1b95566bb00955b9670eb5467fd4fab39dd1f53c1
     container_name: linkstack
     ports:
       - 8005:80
@@ -122,7 +122,7 @@ services:
       - gitea_main
 
   vaultwarden:
-    image: docker.mafyuh.xyz/vaultwarden/server:1.31.0
+    image: vaultwarden/server:1.31.0
     container_name: vaultwarden
     ports:
       - 8989:80

docker/arrs/docker-compose.yml

@@ -116,7 +116,7 @@ services:
     restart: unless-stopped
 
   jfa-go:
-    image: docker.mafyuh.xyz/hrfee/jfa-go
+    image: hrfee/jfa-go
     container_name: jfa-go
     ports:
       - 8056:8056
@@ -158,7 +158,7 @@ services:
     restart: unless-stopped
 
   code-server:
-    image: ghcr.io/linuxserver/code-server@sha256:ce5fc2b0c5956e3fac4bda7647707b2f979757f1baed62ad27af9782d4acc8ce
+    image: ghcr.io/linuxserver/code-server@sha256:5cdea3284e9263e1dc6abf374e4057c32840c4d5e02af2ca515499f7c1cc75bb
     container_name: code-server
     environment:
       - PUID=1000

docker/cf/docker-compose.yml

@@ -2,7 +2,7 @@
 services:
   cf-tunnel:
     restart: unless-stopped
-    image: docker.mafyuh.xyz/cloudflare/cloudflared@sha256:31fc2956d49179f7fd230b030e702e40ade7ccc361d0f1079e4a56bc888678f9
+    image: cloudflare/cloudflared@sha256:31fc2956d49179f7fd230b030e702e40ade7ccc361d0f1079e4a56bc888678f9
     command: tunnel --no-autoupdate run --token $CF_TOKEN
 
   wallos:

docker/downloaders/docker-compose.yml

@@ -16,7 +16,7 @@ services:
     restart: unless-stopped
 
   arch-qbittorrentvpn:
-    image: docker.mafyuh.xyz/binhex/arch-qbittorrentvpn:4.6.5-1-03
+    image: binhex/arch-qbittorrentvpn:4.6.5-1-03
     container_name: qbittorrentvpn
     volumes:
       - '/docker/appdata/qbitty:/config'
@@ -54,26 +54,4 @@ services:
       - '8191:8191'
     environment:
       - LOG_LEVEL=info
-    restart: unless-stopped
+    restart: unless-stopped
-
-  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
-
-  node-exporter:
-    image: docker.mafyuh.xyz/prom/node-exporter:v1.8.2
-    container_name: monitoring_node_exporter
-    restart: unless-stopped
-    ports:
-      - 9100:9100

docker/jellyfin/docker-compose.yml

@@ -22,7 +22,7 @@ services:
     restart: unless-stopped
 
   makemkv:
-    image: docker.mafyuh.xyz/jlesage/makemkv@sha256:39dccc4f82dc76668a78543ac7392a43b6bc6c069e1a3e47e8c058c6cb5f09b0
+    image: jlesage/makemkv@sha256:39dccc4f82dc76668a78543ac7392a43b6bc6c069e1a3e47e8c058c6cb5f09b0
     container_name: makemkv
     ports:
       - 5800:5800

docker/nexus/docker-compose.yml

@@ -1,7 +1,7 @@
 ---
 services:
   nexus:
-    image: docker.mafyuh.xyz/sonatype/nexus3:3.71.0
+    image: sonatype/nexus3:3.71.0
     container_name: nexus
     restart: unless-stopped
     ports:

docker/portainer/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   portainer:
-    image: docker.mafyuh.xyz/portainer/portainer-ee@sha256:0aa305da72738d9f90a209bf74bdc74172004690fa298f52d5f92dd065f26aea
+    image: portainer/portainer-ee@sha256:0aa305da72738d9f90a209bf74bdc74172004690fa298f52d5f92dd065f26aea
     container_name: portainer
     command: -H unix:///var/run/docker.sock
     ports:

docker/twingate/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   twingate-famous-alligator:
-    image: docker.mafyuh.xyz/twingate/connector@sha256:30864d606a6a252ac919220ad32b7d9ea6335497e8ce774216b13bf05aabd4bf
+    image: twingate/connector@sha256:30864d606a6a252ac919220ad32b7d9ea6335497e8ce774216b13bf05aabd4bf
     container_name: twingate-famous-alligator
     restart: always
     environment:

terraform/ubuntu22-template.tf

@@ -8,7 +8,7 @@ resource "proxmox_virtual_environment_vm" "Ubuntu-22-Template" {
 
   disk {
     datastore_id = "Fast2Tb"
-    file_id      = proxmox_virtual_environment_download_file.ubuntu_cloud_image_22.id
+    file_id      = "local:iso/jammy-server-cloudimg-amd64.img"
     interface    = "scsi0"
     size         = 4
   }
@@ -38,11 +38,3 @@ vga {
     }
 
 }
-
-
-resource "proxmox_virtual_environment_download_file" "ubuntu_cloud_image_22" {
-  content_type = "iso"
-  datastore_id = "local"
-  node_name    = "prox"
-  url          = "https://cloud-images.ubuntu.com/jammy/20240720/jammy-server-cloudimg-amd64.img"
-}

terraform/windows.tf

@@ -3,7 +3,7 @@ resource "proxmox_virtual_environment_vm" "Windows11" {
   node_name = "pve2"
   vm_id     = 250
   tags      = ["tofu"]
-  started   = true
+  started   = false
   bios      = "ovmf"
   machine   = "q35"