switch to myspeed, remove hoarder, formatting fixes

docker-compose.yml

@@ -94,8 +94,8 @@ services:
 
   ## Invidious (youtube client)
   invidious:
-    image: quay.io/invidious/invidious:latest
     container_name: invidious
+    image: quay.io/invidious/invidious:latest
     ports:
       - 9080:3000
     env_file:
@@ -110,8 +110,8 @@ services:
       - invidious-sighelper
     restart: unless-stopped
   invidious-sighelper:
-    image: quay.io/invidious/inv-sig-helper:latest
     container_name: invidious-sighelper
+    image: quay.io/invidious/inv-sig-helper:latest
     init: true
     command: ["--tcp", "0.0.0.0:12999"]
     ports:
@@ -125,8 +125,8 @@ services:
       - no-new-privileges:true
     restart: unless-stopped
   invidious-db:
-    image: docker.io/library/postgres:14
     container_name: invidious-db
+    image: docker.io/library/postgres:14
     volumes:
       - ${DOCKER_DIR}/invidious/data:/var/lib/postgresql/data
       - ${DOCKER_DIR}/invidious/config/sql:/config/sql
@@ -137,8 +137,8 @@ services:
 
   ## Jellyfin (media server)
   jellyfin:
-    image: lscr.io/linuxserver/jellyfin:latest
     container_name: jellyfin
+    image: lscr.io/linuxserver/jellyfin:latest
     environment:
       - TZ=${TZ}
       - PUID=1000
@@ -165,8 +165,8 @@ services:
 
   ## Actual (budget)
   actual:
-    image: docker.io/actualbudget/actual-server:latest
     container_name: actual
+    image: docker.io/actualbudget/actual-server:latest
     ports:
       - 5006:5006
     volumes:
@@ -210,8 +210,8 @@ services:
 
   ## ConvertX (file converter)
   convertx: 
-    image: ghcr.io/c4illin/convertx
     container_name: convertx
+    image: ghcr.io/c4illin/convertx
     ports:
       - 9132:3000
     volumes:
@@ -225,8 +225,8 @@ services:
 
   ## Dumbpad (simple notes)
   dumbpad:
-    image: dumbwareio/dumbpad:latest
     container_name: dumbpad
+    image: dumbwareio/dumbpad:latest
     ports:
       - 3007:3000
     volumes:
@@ -237,8 +237,8 @@ services:
 
   ## Gitea
   gitea:
-    image: docker.io/gitea/gitea:latest-rootless
     container_name: gitea
+    image: docker.io/gitea/gitea:latest-rootless
     user: "1001"
     volumes:
       - ${DOCKER_DIR}/gitea/data:/var/lib/gitea
@@ -265,62 +265,19 @@ services:
     ports:
       - 9283:80
     restart: unless-stopped
-    
-  ## Hoarder (link aggregator)
-  hoarder:
-    image: ghcr.io/hoarder-app/hoarder:release
-    container_name: hoarder
-    env_file:
-      - ${ENV_DIR}/hoarder.env
-    volumes:
-      - hoarder:/data
-    ports:
-      - 3017:3000
-    environment:
-      - MEILI_ADDR=http://meilisearch:7700
-      - BROWSER_WEB_URL=http://chrome:9222
-      - DATA_DIR=/data
-    dns:
-      - ${DNS_IP}
-    restart: unless-stopped
-  chrome:
-    image: gcr.io/zenika-hub/alpine-chrome:123
-    container_name: chrome
-    command:
-      - --no-sandbox
-      - --disable-gpu
-      - --disable-dev-shm-usage
-      - --remote-debugging-address=0.0.0.0
-      - --remote-debugging-port=9222
-      - --hide-scrollbars
-    dns:
-      - ${DNS_IP}
-    restart: unless-stopped
-  meilisearch:
-    image: getmeili/meilisearch:v1.11.1
-    container_name: meilisearch
-    env_file:
-      - ${ENV_DIR}/hoarder.env
-    ports:
-      - 7700:7700
-    environment:
-      - MEILI_NO_ANALYTICS=true
-    volumes:
-      - meilisearch:/meili_data
-    restart: unless-stopped
 
   ## IT Tools (misc utilities)
   it-tools:
-    image: corentinth/it-tools:latest
     container_name: it-tools
+    image: corentinth/it-tools:latest
     ports:
       - 5734:80
     restart: unless-stopped
 
   ## Joplin (notes) 
   joplin:
-    image: joplin/server:latest
     container_name: joplin
+    image: joplin/server:latest
     ports:
       - 22300:22300
     env_file:
@@ -331,8 +288,8 @@ services:
       - ${DNS_IP}
     restart: unless-stopped
   joplin-db:
-    image: postgres:15
     container_name: joplin-db
+    image: postgres:15
     volumes:
       - ${DOCKER_DIR}/joplin:/var/lib/postgresql/data
     ports:
@@ -345,8 +302,8 @@ services:
 
   ## Kiwix (offline wiki)
   kiwix-serve:
-    image: ghcr.io/kiwix/kiwix-serve
     container_name: kiwix-serve
+    image: ghcr.io/kiwix/kiwix-serve
     volumes:
       - ${KIWIX_DIR}:/data
     ports:
@@ -358,8 +315,8 @@ services:
 
   ## Link Stack
   linkstack:
-    image: linkstackorg/linkstack
     container_name: linkstack
+    image: linkstackorg/linkstack
     env_file:
       - ${ENV_DIR}/linkstack.env
     ports:
@@ -372,8 +329,8 @@ services:
 
   ## LubeLogger (car mileage tracker)
   lubelogger:
-    image: ghcr.io/hargata/lubelogger:latest
     container_name: lubelogger
+    image: ghcr.io/hargata/lubelogger:latest
     volumes:
       - ${DOCKER_DIR}/lubelogger/data:/App/data
       - ${DOCKER_DIR}/lubelogger/keys:/root/.aspnet/DataProtection-Keys
@@ -385,8 +342,8 @@ services:
 
   ## Maloja (music listen tracking)
   maloja:
-    image: krateng/maloja
     container_name: maloja
+    image: krateng/maloja
     ports:
       - 42010:42010
     volumes:
@@ -399,8 +356,8 @@ services:
       - ${DNS_IP}
     restart: unless-stopped
   multi-scrobbler:
-    image: foxxmd/multi-scrobbler
     container_name: multi-scrobbler
+    image: foxxmd/multi-scrobbler
     env_file:
       - ${ENV_DIR}/multi-scrobbler.env
     volumes:
@@ -411,8 +368,8 @@ services:
 
   ## Miniflux (rss feed reader)
   miniflux:
-    image: miniflux/miniflux:latest
     container_name: miniflux
+    image: miniflux/miniflux:latest
     ports:
       - 8772:8080
     depends_on:
@@ -426,8 +383,8 @@ services:
       - ${DNS_IP}
     restart: unless-stopped
   rss_db:
-    image: postgres:15
     container_name: rss_db
+    image: postgres:15
     env_file:
       - ${ENV_DIR}/miniflux.env
     volumes:
@@ -440,8 +397,8 @@ services:
 
   ## Paperless (document management)
   paperless:
-    image: ghcr.io/paperless-ngx/paperless-ngx:latest
     container_name: paperless
+    image: ghcr.io/paperless-ngx/paperless-ngx:latest
     user: 1000:1000
     depends_on:
       - paperless_broker
@@ -456,8 +413,8 @@ services:
       - ${ENV_DIR}/paperless.env
     restart: unless-stopped
   paperless_broker:
-    image: docker.io/library/redis:7
     container_name: paperless_broker
+    image: docker.io/library/redis:7
     volumes:
       - redis-data:/data
     restart: unless-stopped
@@ -547,8 +504,8 @@ services:
       - ${DNS_IP}
     restart: unless-stopped
   tandoor-server:
-    image: nginx:mainline-alpine
     container_name: tandoor-server
+    image: nginx:mainline-alpine
     ports:
       - 8554:80
     env_file:
@@ -642,8 +599,8 @@ services:
 
   ## Glances (system monitor)
   glances:
-    image: nicolargo/glances:latest
     container_name: glances
+    image: nicolargo/glances:latest
     pid: host
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
@@ -677,19 +634,14 @@ services:
       - /dev/sdd:/dev/sdd
     restart: unless-stopped
 
-  ## Speedtest Tracker
+  ## MySpeed (internet speed tracker)
-  speedtest-tracker:
+  myspeed:
-    image: lscr.io/linuxserver/speedtest-tracker:latest
+    container_name: myspeed
-    container_name: speedtest-tracker
+    image: germannewsmaker/myspeed
-    ports:
-      - 8465:80
-      - 8466:443
-    env_file:
-      - ${ENV_DIR}/speedtest.env
     volumes:
-      - ${DOCKER_DIR}/speedtest-tracker:/config
+      - ${DOCKER_DIR}/myspeed:/myspeed/data
-    dns:
+    ports:
-      - ${DNS_IP}
+      - 5216:5216
     restart: unless-stopped
 
 
@@ -697,8 +649,8 @@ services:
 
   ## AdGuard Home (ad-blocking dns provider)
   adguard:
-    image: adguard/adguardhome
     container_name: adguard
+    image: adguard/adguardhome
     network_mode: host
     volumes:
       - ${DOCKER_DIR}/adguard/working:/opt/adguardhome/work
@@ -719,8 +671,8 @@ services:
 
   ## Gluetun (vpn connector)
   gluetun:
-    image: qmcgaw/gluetun:latest
     container_name: gluetun
+    image: qmcgaw/gluetun:latest
     hostname: gluetun
     cap_add:
       - NET_ADMIN
@@ -752,8 +704,8 @@ services:
 
   ## Bazarr (subtitle downloading)
   bazarr:
-    image: lscr.io/linuxserver/bazarr:latest
     container_name: bazarr
+    image: lscr.io/linuxserver/bazarr:latest
     environment:
       - puid=1000
       - pgid=1000
@@ -768,8 +720,8 @@ services:
 
   ## Calibre Downloader (ebook downloading)
   calibre-dl:
-    image: ghcr.io/calibrain/calibre-web-automated-book-downloader:latest
     container_name: calibre-dl
+    image: ghcr.io/calibrain/calibre-web-automated-book-downloader:latest
     environment:
       - FLASK_PORT=8084
       - FLASK_DEBUG=false
@@ -785,16 +737,16 @@ services:
     restart: unless-stopped
   ## Cloudflare challenge bypass (for accessing Anna's Archive)
   cf-bypass:
-    image: ghcr.io/sarperavci/cloudflarebypassforscraping:latest
     container_name: cf-bypass
+    image: ghcr.io/sarperavci/cloudflarebypassforscraping:latest
     dns:
       - ${DNS_IP}
     restart: unless-stopped
 
   ## openbooks (IRC-based ebook downloading)
   openbooks:
-    image: evanbuss/openbooks:latest
     container_name: openbooks
+    image: evanbuss/openbooks:latest
     command: --persist --name azpsen
     ports:
       - 8087:80
@@ -807,8 +759,8 @@ services:
 
   ## Prowlarr (torrent indexer management)
   prowlarr:
-    image: ghcr.io/linuxserver/prowlarr:nightly
     container_name: prowlarr
+    image: ghcr.io/linuxserver/prowlarr:nightly
     network_mode: "service:gluetun"
     environment:
         - TZ=${TZ}
@@ -820,8 +772,8 @@ services:
 
   ## QBittorrent (torrent client)
   qbittorrent:
-    image: ghcr.io/linuxserver/qbittorrent:latest
     container_name: qbittorrent
+    image: ghcr.io/linuxserver/qbittorrent:latest
     network_mode: "service:gluetun"
     environment:
       - TZ=${TZ}
@@ -836,8 +788,8 @@ services:
 
   ## Radarr (movie downloading)
   radarr:
-    image: ghcr.io/linuxserver/radarr:latest
     container_name: radarr
+    image: ghcr.io/linuxserver/radarr:latest
     network_mode: "service:gluetun"
     environment:
       - TZ=${TZ}
@@ -851,8 +803,8 @@ services:
 
   ## Sonarr (tv show downloading)
   sonarr:
-    image: ghcr.io/linuxserver/sonarr:latest
     container_name: sonarr
+    image: ghcr.io/linuxserver/sonarr:latest
     network_mode: "service:gluetun"
     environment:
       - TZ=${TZ}