immich version bump, add workout tracker

.env

@@ -9,3 +9,21 @@ DNS_IP=100.111.0.126
 
 # Time zone
 TZ=America/Chicago
+
+# Jellyfin directories
+JF_MOVIES=/media/jf/movies
+JF_SHOWS=/media/jf/shows
+JF_MUSIC=/media/jf/music
+
+# Immich directories
+IMMICH_LIBRARY=/media/immich
+
+# Kiwix directories
+KIWIX_DIR=/media/kiwix
+
+# qBittorrent directories
+QB_EXT_DL=/media/dl
+
+# Audiobookshelf directories
+ABS_BOOKS=/media/abs/audiobooks
+ABS_PODS=/media/abs/podcasts

docker-compose.yml

@@ -13,9 +13,8 @@ services:
     ports:
       - 13378:80
     volumes:
-      - /media/audiobooks:/audiobooks
+      - ${ABS_BOOKS}:/audiobooks
-      - /media/audiobooks-pt:/audiobooks-pt
+      - ${ABS_PODS}:/podcasts
-      - /media/podcasts:/podcasts
       - ${DOCKER_DIR}/audiobookshelf/config:/config
       - ${DOCKER_DIR}/audiobookshelf/metadata:/metadata
     dns:
@@ -31,42 +30,23 @@ services:
       - ${DNS_IP}
     restart: unless-stopped
 
-  # Calibre (ebook management)
-  calibre-web-automated:
-    image: crocodilestick/calibre-web-automated:latest
-    container_name: calibre-web
-    environment:
-      - ${TZ}
-      - PUID=1000
-      - PGID=100
-      - DOCKER_MODS=lscr.io/linuxserver/mods:universal-calibre-v7.16.0
-    volumes:
-      - ${DOCKER_DIR}/calibre/config:/config
-      - ${DOCKER_DIR}/calibre/ingest:/cwa-book-ingest
-      - ${DOCKER_DIR}/calibre/books:/calibre-library
-    ports:
-      - 8083:8083
-    dns:
-      - ${DNS_IP}
-    restart: unless-stopped
-
   ## Immich (photo library management)
-  immich-server:
+  immich_server:
     container_name: immich_server
-    image: ghcr.io/immich-app/immich-server:v1.129.0
+    image: ghcr.io/immich-app/immich-server:v1.132.1
     volumes:
-      - /media/immich:/usr/src/app/upload
+      - ${IMMICH_LIBRARY}:/usr/src/app/upload
-      - ${DOCKER_DIR}/immich_db_dump:/db_dump
     env_file:
       - ${ENV_DIR}/immich.env
     environment:
+      - TZ=${TZ}
       - PUID=1000
       - PGID=1000
     ports:
       - 2283:2283
     depends_on:
-      - redis
+      - immich_redis
-      - database
+      - immich_db
     devices:
       - /dev/dri:/dev/dri
     dns:
@@ -74,18 +54,18 @@ services:
     restart: unless-stopped
   immich-machine-learning:
     container_name: immich_machine_learning
-    image: ghcr.io/immich-app/immich-machine-learning:v1.129.0
+    image: ghcr.io/immich-app/immich-machine-learning:v1.132.1
     volumes:
       - model-cache:/cache
     env_file:
       - ${ENV_DIR}/immich.env
     restart: unless-stopped
-  redis:
+  immich_redis:
     container_name: immich_redis
     image: redis:6.2-alpine@sha256:70a7a5b641117670beae0d80658430853896b5ef269ccf00d1827427e3263fa3
     restart: unless-stopped
-  database:
+  immich_db:
-    container_name: immich_postgres
+    container_name: immich_db
     image: tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
     env_file:
       - ${ENV_DIR}/immich.env
@@ -93,60 +73,64 @@ services:
       - ${DOCKER_DIR}/immich:/var/lib/postgresql/data
     restart: unless-stopped
 
-#  ## Invidious (youtube client)
+  ## Invidious (youtube client)
-#  invidious:
+  invidious:
-#    image: quay.io/invidious/invidious:latest
+    container_name: invidious
-#    container_name: invidious
+    image: quay.io/invidious/invidious:latest
-#    ports:
+    ports:
-#      - 9080:3000
+      - 9080:3000
-#    env_file:
+    env_file:
-#      - ${ENV_DIR}/invidious.env
+      - ${ENV_DIR}/invidious.env
-#    depends_on:
+    healthcheck:
-#      - invidious-db
+      test: wget -nv --tries=1 --spider http://127.0.0.1:3000/api/v1/trending || exit 1
-#      - sighelper
+      interval: 30s
-#    restart: unless-stopped
+      timeout: 5s
-#  sighelper:
+      retries: 2
-#    image: quay.io/invidious/inv-sig-helper:latest
+    depends_on:
-#    container_name: invidious-sighelper
+      - invidious-db
-#    init: true
+      - invidious-sighelper
-#    command: ["--tcp", "0.0.0.0:12999"]
+    restart: unless-stopped
-#    ports:
+  invidious-sighelper:
-#      - 12999:12999
+    container_name: invidious-sighelper
-#    environment:
+    image: quay.io/invidious/inv-sig-helper:latest
-#      - ${TZ}
+    init: true
-#      - RUST_LOG=info
+    command: ["--tcp", "0.0.0.0:12999"]
-#    cap_drop:
+    ports:
-#      - ALL
+      - 12999:12999
-#    read_only: true
+    environment:
-#    security_opt:
+      - RUST_LOG=info
-#      - no-new-privileges:true
+    cap_drop:
-#    restart: unless-stopped
+      - ALL
-#  invidious-db:
+    read_only: true
-#    image: docker.io/library/postgres:14
+    security_opt:
-#    container_name: invidious-db
+      - no-new-privileges:true
-#    volumes:
+    restart: unless-stopped
-#      - ${DOCKER_DIR}/invidious/data:/var/lib/postgresql/data
+  invidious-db:
-#      - ${DOCKER_DIR}/invidious/config/sql:/config/sql
+    container_name: invidious-db
-#      - ${DOCKER_DIR}/invidious/docker/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh
+    image: docker.io/library/postgres:14
-#    env_file:
+    volumes:
-#      - ${ENV_DIR}/invidious.env
+      - ${DOCKER_DIR}/invidious/data:/var/lib/postgresql/data
-#    restart: unless-stopped
+      - ${DOCKER_DIR}/invidious/config/sql:/config/sql
+      - ${DOCKER_DIR}/invidious/docker/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh
+    env_file:
+      - ${ENV_DIR}/invidious.env
+    restart: unless-stopped
 
   ## Jellyfin (media server)
   jellyfin:
-    image: lscr.io/linuxserver/jellyfin:latest
     container_name: jellyfin
+    image: lscr.io/linuxserver/jellyfin:latest
     environment:
-      - ${TZ}
+      - TZ=${TZ}
       - PUID=1000
       - PGID=1000
       - JELLYFIN_PublishedServerUrl=https://watch.azpsen.com
     volumes:
       - ${DOCKER_DIR}/jellyfin:/config
       - ${DOCKER_DIR}/jellyfin/theme:/usr/share/jellyfin/web/theme
-      - /media/jellyfin/Movies:/data/movies
+      - ${JF_MOVIES}:/data/movies
-      - /media/jellyfin/TV Shows:/data/tvshows
+      - ${JF_SHOWS}:/data/tvshows
-      - /media/jellyfin/Music:/data/music
+      - ${JF_MUSIC}:/data/music
     ports:
       - 8096:8096
       - 7539:7539/udp
@@ -161,9 +145,9 @@ services:
 #---------------- UTILITIES ----------------#
 
   ## Actual (budget)
-  actual_server:
+  actual:
-    image: docker.io/actualbudget/actual-server:latest
     container_name: actual
+    image: docker.io/actualbudget/actual-server:latest
     ports:
       - 5006:5006
     volumes:
@@ -172,10 +156,58 @@ services:
       - ${DNS_IP}
     restart: unless-stopped
 
+  ## Baikal (calendar/contacts)
+  baikal:
+    container_name: baikal
+    image: ckulka/baikal:nginx
+    ports:
+      - 8391:80
+    volumes:
+      - ${DOCKER_DIR}/baikal/config:/var/www/baikal/config
+      - ${DOCKER_DIR}/baikal/data:/var/www/baikal/Specific
+    restart: unless-stopped
+
+  ## Backrest (backup GUI)
+  backrest:
+    container_name: backrest
+    image: garethgeorge/backrest:latest
+    hostname: backrest
+    volumes:
+      - ${DOCKER_DIR}/backrest/data:/data
+      - ${DOCKER_DIR}/backrest/config:/config
+      - ${DOCKER_DIR}/backrest/cache:/cache
+      - ${DOCKER_DIR}/backrest/tmp:/tmp
+      - ${DOCKER_DIR}:/userdata/docker
+      - ${IMMICH_LIBRARY}:/userdata/immich
+    environment:
+      - BACKREST_DATA=/data
+      - BACKREST_CONFIG=/config/config.json
+      - XDG_CACHE_HOME=/cache
+      - TMPDIR=/tmp
+      - TZ=${TZ}
+    ports:
+      - 9898:9898
+    restart: unless-stopped
+
+  ## ConvertX (file converter)
+  convertx: 
+    container_name: convertx
+    image: ghcr.io/c4illin/convertx
+    ports:
+      - 9132:3000
+    volumes:
+      - ${DOCKER_DIR}/convertx:/app/data
+    env_file:
+      - ${ENV_DIR}/convertx.env
+    environment:
+      - PUID=1000
+      - PGID=1000
+    restart: unless-stopped
+
   ## 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
@@ -189,133 +221,20 @@ services:
       - ${DNS_IP}
     restart: unless-stopped
 
-  ## Grocy (home inventory management)
+  ## IT Tools (misc utilities)
-  grocy:
+  it-tools:
-    container_name: grocy
+    container_name: it-tools
-    image: lscr.io/linuxserver/grocy:latest
+    image: corentinth/it-tools:latest
-    environment:
-      - ${TZ}
-      - PUID=1000
-      - PGID=1000
-    volumes:
-      - ${DOCKER_DIR}/grocy:/config
     ports:
-      - 9283:80
+      - 5734:80
-    restart: unless-stopped
-
-  ## TinyHome (server dashboard)
-  tinyhome:
-    container_name: tinyhome
-    image: azpsen/tinyhome:main
-    environment:
-      - REFRESH_INTERVAL=360
-    ports:
-      - 3000:80
-    volumes:
-    - ${DOCKER_DIR}/tinyhome:/config:rw
-    dns:
-      - ${DNS_IP}
-    restart: unless-stopped
-
-  docker-proxy:
-    image: ghcr.io/tecnativa${DOCKER_DIR}-socket-proxy:latest
-    container_name: docker-proxy
-    environment:
-      - CONTAINERS=1 # Allow access to viewing containers
-      - POST=0 # Disallow any POST operations (effectively read-only)
-    ports:
-      - 2375:2375
-    volumes:
-      - /var/run${DOCKER_DIR}.sock:/var/run${DOCKER_DIR}.sock:ro
-    restart: unless-stopped
-
-  ## Dumbpad (simple notes)
-  dumbpad:
-    image: dumbwareio/dumbpad:latest
-    container_name: dumbpad
-    ports:
-      - 3007:3000
-    volumes:
-      - ${DOCKER_DIR}/dumbpad:/app/data
-    env_file:
-      - ${ENV_DIR}/dumbpad.env
-    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
-
-  ## Joplin (notes) 
-  joplin:
-    image: joplin/server:latest
-    container_name: joplin
-    ports:
-      - 22300:22300
-    env_file:
-      - ${ENV_DIR}/joplin.env
-    depends_on:
-      - joplin-db
-    dns:
-      - ${DNS_IP}
-    restart: unless-stopped
-  joplin-db:
-    image: postgres:15
-    container_name: joplin-db
-    volumes:
-      - ${DOCKER_DIR}/joplin:/var/lib/postgresql/data
-    ports:
-      - 5432:5432
-    environment:
-      - POSTGRES_PASSWORD=d8t3nmcj3
-      - POSTGRES_USER=april
-      - POSTGRES_DB=joplin
     restart: unless-stopped
 
   ## Kiwix (offline wiki)
   kiwix-serve:
-    image: ghcr.io/kiwix/kiwix-serve
     container_name: kiwix-serve
+    image: ghcr.io/kiwix/kiwix-serve
     volumes:
-      - /media/kiwix:/data
+      - ${KIWIX_DIR}:/data
     ports:
       - 8765:8080
     command: '*.zim'
@@ -323,24 +242,10 @@ services:
       - ${DNS_IP}
     restart: unless-stopped
 
-  ## Link Stack
-  linkstack:
-    image: linkstackorg/linkstack
-    container_name: linkstack
-    env_file:
-      - ${ENV_DIR}/linkstack.env
-    ports:
-      - 4000:80
-    dns:
-      - ${DNS_IP}
-    volumes:
-      - linkstack:/htdocs
-    restart: unless-stopped
-
   ## 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
@@ -352,8 +257,8 @@ services:
 
   ## Maloja (music listen tracking)
   maloja:
-    image: krateng/maloja
     container_name: maloja
+    image: krateng/maloja
     ports:
       - 42010:42010
     volumes:
@@ -366,20 +271,30 @@ 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
+      - ${ENV_DIR}/scrobbler.env
     volumes:
-      - ${DOCKER_DIR}/multi-scrobbler:/config
+      - ${DOCKER_DIR}/scrobbler:/config
     ports:
       - 9078:9078
     restart: unless-stopped
 
+  ## Memos (simple note app)
+  memos:
+    container_name: memos
+    image: neosmemo/memos:stable
+    volumes:
+      - ${DOCKER_DIR}/memos:/var/opt/memos
+    ports:
+      - 5230:5230
+    restart: unless-stopped
+
   ## Miniflux (rss feed reader)
   miniflux:
-    image: miniflux/miniflux:latest
     container_name: miniflux
+    image: miniflux/miniflux:latest
     ports:
       - 8772:8080
     depends_on:
@@ -393,8 +308,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:
@@ -407,8 +322,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
@@ -423,12 +338,57 @@ 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
 
+  ## PicoShare (file sharing tool)
+  picoshare:
+    container_name: picoshare
+    image: mtlynch/picoshare
+    env_file:
+      - ${ENV_DIR}/picoshare.env
+    ports:
+      - 4001:4001
+    command: -db /data/store.db
+    volumes:
+      - ${DOCKER_DIR}/picoshare:/data
+    dns:
+      - ${DNS_IP}
+    restart: unless-stopped
+
+  ## SeaFile (cloud drive)
+  seafile:
+    container_name: seafile
+    image: seafileltd/seafile-mc:11.0-latest
+    ports:
+      - 8623:80
+    volumes:
+      - ${DOCKER_DIR}/seafile/data:/shared
+    env_file:
+      - ${ENV_DIR}/seafile.env
+    environment:
+      - TIME_ZONE=${TZ}
+    depends_on:
+      - seafile_db
+      - seafile_cache
+    restart: unless-stopped
+  seafile_db:
+    container_name: seafile-mysql
+    image: mariadb:10.11
+    env_file:
+      - ${ENV_DIR}/seafile.env
+    volumes:
+      - ${DOCKER_DIR}/seafile/db:/var/lib/mysql
+    restart: unless-stopped
+  seafile_cache:
+    container_name: seafile_cache
+    image: memcached:1.6.18
+    entrypoint: memcached -m 256
+    restart: unless-stopped
+
   ## Stirling PDF (pdf utilities)
   stirling-pdf:
     container_name: stirling-pdf
@@ -442,7 +402,7 @@ services:
       - ${DOCKER_DIR}/stirlingpdf/logs:/logs/
       - ${DOCKER_DIR}/stirlingpdf/pipeline:/pipeline/
     environment:
-      - ${TZ}
+      - TZ=${TZ}
       - DOCKER_ENABLE_SECURITY=false
       - LANGS=en_US
       - DOCKER_ENABLE_SECURITY=true
@@ -469,8 +429,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:
@@ -494,10 +454,24 @@ services:
       - ${DOCKER_DIR}/tandoor/postgresql:/var/lib/postgresql/data
     restart: unless-stopped
 
+  ## TinyHome (server dashboard)
+  tinyhome:
+    container_name: tinyhome
+    image: azpsen/tinyhome:main
+    environment:
+      - REFRESH_INTERVAL=360
+    ports:
+      - 3000:80
+    volumes:
+    - ${DOCKER_DIR}/tinyhome:/config:rw
+    dns:
+      - ${DNS_IP}
+    restart: unless-stopped
+
   ## Vaultwarden (password manager)
   vaultwarden:
-    image: vaultwarden/server:latest
     container_name: vaultwarden
+    image: vaultwarden/server:latest
     env_file:
       - ${ENV_DIR}/vaultwarden.env
     volumes:
@@ -508,7 +482,33 @@ services:
       - ${DNS_IP}
     restart: unless-stopped
 
-  # Wizarr (jellyfin invites)
+  ## Wallabag (bookmark manager)
+  wallabag:
+    container_name: wallabag
+    image: wallabag/wallabag
+    env_file:
+      - ${ENV_DIR}/wallabag.env
+    ports:
+      - 5438:80
+    volumes:
+      - ${DOCKER_DIR}/wallabag/images:/var/www/wallabag/web/assets/images
+      - ${DOCKER_DIR}/wallabag/data:/var/www/wallabag/data
+    dns:
+      - ${DNS_IP}
+    restart: unless-stopped
+
+  ## Personal Website
+  webserver:
+    container_name: azpsen
+    image: lipanski/docker-static-website:latest
+    ports:
+      - 4000:3000
+    volumes:
+      - ${DOCKER_DIR}/azpsen/static:/home/static
+      - ${DOCKER_DIR}/azpsen/httpd.conf:/home/static/httpd.conf:ro
+    restart: unless-stopped
+
+  ## Wizarr (jellyfin invites)
   wizarr:
     container_name: wizarr
     image: ghcr.io/wizarrrr/wizarr:latest
@@ -520,49 +520,58 @@ services:
       - ${DNS_IP}
     restart: unless-stopped
 
+  ## Workout Tracker
+  workout-tracker:
+    container_name: workout-tracker
+    image: ghcr.io/jovandeginste/workout-tracker:master
+    ports:
+      # Host Port:Container Port
+      - 5021:8080
+    volumes:
+      - ${DOCKER_DIR}/workout-tracker:/data
+    env_file:
+      - ${ENV_DIR}/workout-tracker.env
+    restart: unless-stopped
+
+
 
 #---------------- MONITORING ----------------#
 
+
+  ## Beszel (system monitoring)
+  beszel:
+    container_name: beszel
+    image: henrygd/beszel
+    env_file:
+      - ${ENV_DIR}/beszel.env
+    ports:
+      - 2493:8090
+    volumes:
+      - ${DOCKER_DIR}/beszel/data:/beszel_data
+      - ${DOCKER_DIR}/beszel/socket:/beszel_socket
+    restart: unless-stopped
+  beszel-agent:
+    container_name: beszel-agent
+    image: henrygd/beszel-agent:latest
+    env_file:
+      - ${ENV_DIR}/beszel.env
+    volumes:
+      - ${DOCKER_DIR}/beszel/socket:/beszel_socket
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - /media:/extra-filesystems/media:ro
+    network_mode: host
+    restart: unless-stopped
+
   ## Dozzle (docker logs)
   dozzle:
     container_name: dozzle
     image: amir20/dozzle:latest
     volumes:
-      - /var/run${DOCKER_DIR}.sock:/var/run${DOCKER_DIR}.sock:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
     ports:
       - 9999:8080
     restart: unless-stopped
 
-  ## Glances (system monitor)
-  glances:
-    image: nicolargo/glances:latest
-    container_name: glances
-    pid: host
-    volumes:
-      - /var/run${DOCKER_DIR}.sock:/var/run${DOCKER_DIR}.sock
-      - /:/glances/root:ro
-    environment:
-      - "GLANCES_OPT=-w"
-    ports:
-      - 61208:61208
-    secrets:
-      - source: glances_password
-        target: /root/.config/glances/glances.pwd
-    restart: unless-stopped
-
-  ## Doku (docker disk usage analyzer)
-  doku:
-    container_name: doku
-    image: amerkurev/doku
-    ports:
-      - 9090:9090
-    volumes:
-      - /var/run${DOCKER_DIR}.sock:/var/run${DOCKER_DIR}.sock:ro
-      - /:/hostroot:ro
-    environment:
-      - SI=false
-    restart: unless-stopped
-
   ## Scrutiny (disk health monitoring)
   scrutiny:
     container_name: scrutiny
@@ -583,17 +592,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
+    ports:
+      - 5216:5216
     dns:
       - ${DNS_IP}
     restart: unless-stopped
@@ -603,8 +609,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
@@ -625,8 +631,8 @@ services:
 
   ## Gluetun (vpn connector)
   gluetun:
-    image: qmcgaw/gluetun:latest
     container_name: gluetun
+    image: qmcgaw/gluetun:latest
     hostname: gluetun
     cap_add:
       - NET_ADMIN
@@ -658,66 +664,27 @@ 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
       - tz=america/chicago
     volumes:
       - ${DOCKER_DIR}/bazarr:/config
-      - /media/jellyfin/movies:/movies
+      - ${JF_MOVIES}:/movies
-      - /media/jellyfin/tv shows:/tv
+      - ${JF_SHOWS}:/tv
     ports:
       - 6767:6767
     restart: unless-stopped
 
-  ## Calibre Downloader (ebook downloading)
-  calibre-dl:
-    image: ghcr.io/calibrain/calibre-web-automated-book-downloader:latest
-    container_name: calibre-dl
-    environment:
-      - FLASK_PORT=8084
-      - FLASK_DEBUG=false
-      - CLOUDFLARE_PROXY_URL=http://cf-bypass:8000
-      - INGEST_DIR=/cwa-book-ingest
-      - BOOK_LANGUAGE=en
-    ports:
-      - 8085:8084
-    volumes:
-      - ${DOCKER_DIR}/calibre/ingest:/cwa-book-ingest
-    dns:
-      - ${DNS_IP}
-    restart: unless-stopped
-  ## Cloudflare challenge bypass (for accessing Anna's Archive)
-  cf-bypass:
-    image: ghcr.io/sarperavci/cloudflarebypassforscraping:latest
-    container_name: cf-bypass
-    dns:
-      - ${DNS_IP}
-    restart: unless-stopped
-
-  ## openbooks (IRC-based ebook downloading)
-  openbooks:
-    image: evanbuss/openbooks:latest
-    container_name: openbooks
-    command: --persist --name azpsen
-    ports:
-      - 8087:80
-    volumes:
-      # This works because calibre-web-automated fails to import .tmp files
-      - ${DOCKER_DIR}/calibre/ingest/:/books
-    dns:
-      - ${DNS_IP}
-    restart: unless-stopped
-
   ## 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=${TZ}
         - PUID=1000
         - PGID=1000
     volumes:
@@ -726,42 +693,42 @@ 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=${TZ}
       - PUID=1000
       - PGID=1000
       - WEBUI_PORT=8080
     volumes:
       - ${DOCKER_DIR}/qbittorrent/config:/config
       - ${DOCKER_DIR}/qbittorrent/downloads:/downloads
-      - /media/downloads:/ext_dl
+      - ${QB_EXT_DL}:/ext_dl
     restart: unless-stopped
 
   ## 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=${TZ}
       - PUID=1000
       - PGID=1000
     volumes:
       - ${DOCKER_DIR}/radarr:/config
-      - /media/jellyfin/Movies:/Movies #optional
+      - ${JF_MOVIES}:/Movies #optional
       - ${DOCKER_DIR}/qbittorrent/downloads:/downloads #optional
     restart: unless-stopped
 
   ## 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=${TZ}
       - PUID=1000
       - PGID=1000
       - DOCKER_MODS=ghcr.io/gilbn/theme.park:sonarr
@@ -769,21 +736,16 @@ services:
       - TP_THEME=dark
     volumes:
       - ${DOCKER_DIR}/sonarr:/config
-      - /media/jellyfin/TV Shows:/TV Shows
+      - ${JF_SHOWS}:/TV Shows
       - ${DOCKER_DIR}/qbittorrent/downloads:/downloads
     restart: unless-stopped
 
 
 #---------------- DOCKER ----------------#
 
-secrets:
-  glances_password:
-    file: ${DOCKER_DIR}/secrets/glances_password
-
 volumes:
   hoarder:
   joplindb:
-  linkstack:
   meilisearch:
   model-cache:
   miniflux-db:

readme.md

@@ -16,10 +16,8 @@ These are all the services hosted, what they are for, and any clients I use with
 
 ### Media
 
-- [AudioBookShelf](https://www.audiobookshelf.org/) - Audiobook server
+- [AudioBookShelf](https://www.audiobookshelf.org/) - Audiobook, ebook, and podcast server
   - The official mobile client works great
-- [Calibre Web Automated](https://github.com/crocodilestick/Calibre-Web-Automated) - Ebook management
-  - [Yomu](https://www.yomu-reader.com/) for iOS is nice and minimal and supports OPDS for use with Calibre Web
 - [Immich](https://immich.app/) - Photo and video management
   - Their official mobile apps are quite good
 - [Jellyfin](https://jellyfin.org) - Media server for movies, TV shows, and music
@@ -31,41 +29,46 @@ These are all the services hosted, what they are for, and any clients I use with
 
 - [Actual Budget](https://actualbudget.org/) - Excellent budgeting app. It can be automatically synced with your bank ([SimpleFIN Bridge](https://beta-bridge.simplefin.org/) for US banks, $15/year), but I have found that to be unstable
   - There used to be an official app but it has been discontinued - I added the website to my phone's home screen and it works quite well
-- [DumbPad](https://github.com/DumbWareio/DumbPad) - Stupid simple notes app (for grocery lists, quick notes, etc.)
+- [Baikal](https://sabre.io/baikal/) - Calendar/contacts
+- [Backrest](https://github.com/garethgeorge/backrest) - UI to manage backups (sent to a Raspberry Pi 5 running [restic](https://restic.net/))
+- [ConvertX](https://github.com/C4illin/ConvertX) - File conversion utility
 - [Gitea](https://about.gitea.com/) - Git server - in the process of replacing my GitHub account
-- [Grocy](https://github.com/grocy/grocy) - Household management (Am I out of milk? Do I have AAA batteries? What can I make for dinner?)
   - [iOS Client](https://apps.apple.com/us/app/grocy-mobile/id1567803209)
-- [Hoarder](https://hoarder.app/) - Bookmark tool for links, pictures, notes, etc. with AI tagging
+- [Wallabag](https://wallabag.org/) - Bookmark tool for links, pictures, notes, etc.
-  - The official app seems to work well
+- [IT Tools](https://github.com/CorentinTh/it-tools) - Collection of random useful development/IT utilities
-- [Joplin](https://joplinapp.org/) - Notes (Obsidian alternative)
 - [Kiwix](https://kiwix.org/en/) - Offline wiki hosting - I have Wikipedia, the Arch Linux wiki, and several others downloaded
-- [LinkStack](https://linkstack.org/) - Self-hosted LinkTree alternative ([azpsen.com](https://azpsen.com)) - more for content creators, definitely overkill for what I need. I'll probably replace it with a simple static site at some point
+- [LubeLogger](https://lubelogger.com/) - Car mileage and service tracker
 - [Maloja](https://github.com/krateng/maloja) - Self-hosted music listen tracker (last.fm replacement) - with [multi-scrobbler](https://github.com/FoxxMD/multi-scrobbler) for Jellyfin support
+- [Memos](https://github.com/usememos/memos) - Super simple note/list/todo/memo app
 - [Miniflux](https://miniflux.app/) - Minimalist RSS feed reader
   - [NetNewsWire](https://netnewswire.com/) - Wonderful all-purpose iOS RSS client
 - [Paperless-ngx](https://docs.paperless-ngx.com/) - Document management system for legal documents, IDs, bank statements, etc.
   - [Swift Paperless](https://github.com/paulgessinger/swift-paperless) - iOS client
+- [PicoShare](https://github.com/picocss/pico) - Super simple file sharing tool
+- [Seafile](https://www.seafile.com/en/home/) - Cloud drive
+- [Static Webserver](https://github.com/lipanski/docker-static-website) - Simple Docker container with BusyBox to serve my personal website ([azpsen.com](https://azpsen.com))
 - [Stirling PDF](https://www.stirlingpdf.com/) - PDF tools for viewing, editing, converting, and everything else
 - [Tandoor](https://tandoor.dev/) - Recipe management, so I always know which zucchine muffin recipe is the good one
   - [Untare](https://github.com/phantomate/Untare) - Mobile client (discontinued but it still works for now)
 - [Tinyhome](https://github.com/bderenzo/tinyhome) - Static new tab page set up with links to all my server stuff
-- [vaultwarden](https://github.com/dani-garcia/vaultwarden) - Password manager
+- [Vaultwarden](https://github.com/dani-garcia/vaultwarden) - Password manager
   - [Bitwarden clients](https://bitwarden.com/download/)
 - [Wizarr](https://github.com/Wizarrrr/wizarr?tab=readme-ov-file) - Jellyfin user invite manager
+- [Workout Tracker](https://github.com/jovandeginste/workout-tracker) - Used with [OpenTracks](https://github.com/OpenTracksApp/OpenTracks) to track my cycling
 
 ### Monitoring
 
+- [Beszel](https://www.beszel.dev/) - System stats with pretty graphs
 - [Dozzle](https://dozzle.dev/) - Docker logs all in one place
 - [Glances](https://github.com/nicolargo/glances) - System monitor - I mostly have this for dashboard widgets but it can be useful by itself
 - [Scrutiny](https://github.com/AnalogJ/scrutiny) - HDD SMART monitoring, so I know when to prepare for a drive failure
-- [Doku](https://github.com/amerkurev/doku) - Docker disk usage monitor - makes it easy to see how much space I can free up by pruning
+- [MySpeed](https://github.com/gnmyt/myspeed) - Runs scheduled internet speedtests and creates pretty graphs to keep my ISP honest
-- [Speedtest Tracker](https://speedtest-tracker.dev/) - Runs scheduled internet speedtests and creates pretty graphs to keep my ISP honest
 
 ### Networking
 
 - [AdGuard Home](https://adguard.com/en/adguard-home/overview.html) - DNS filtering - I use this with [tailscale](https://tailscale.com/) to block ads on my phone
-- [cloudflared](https://github.com/cloudflare/cloudflared) - CloudFlare tunnel client for easy and secure external service access
+- [Cloudflared](https://github.com/cloudflare/cloudflared) - CloudFlare tunnel client for easy and secure external service access
-- [gluetun](https://github.com/qdm12/gluetun) - Docker VPN client and kill-switch. Very useful, allows for per-container VPN routing.
+- [Gluetun](https://github.com/qdm12/gluetun) - Docker VPN client and kill-switch. Very useful, allows for per-container VPN routing.
 
 Note that I run tailscale as a system service, not in a container, so it is not listed here, but it is very useful for secure remote access - both for SSH and for services that don't need to be publicly visible.
 
@@ -74,9 +77,7 @@ In `docker-compose.yml`, services that I access through tailscale need the `dns:
 ### Downloading
 
 - [Bazarr](https://www.bazarr.media/) - Automated subtitle fetching (I also use the OpenSubtitles plugin within Jellyfin when needed, but this works hands-off most of the time)
-- [Calibre Web Book Downloader](https://github.com/calibrain/calibre-web-automated-book-downloader) - Automated ebook search and downloading
+- [Prowlarr](https://prowlarr.com/) - Torrent indexer that interfaces with the other \*arrs
-- [openbooks](https://github.com/evan-buss/openbooks) - Automated IRC-based ebook search and downloading
-- [Prowlarr](https://prowlarr.com/) - Torrent indexer that interfaces with the other *arrs
 - [qBittorrent](https://www.qbittorrent.org/) - The only torrent client I'll ever use
 - [Radarr](https://radarr.video/) - Automated movie fetching
 - [Sonarr](https://sonarr.tv/) - Automated TV show fetching
@@ -108,7 +109,22 @@ Below are the variables that need to be set in the `.env` file for each service.
 > - Password: API Key generated in SendGrid
 > - From: `<mailer-name>@<your-domain>` - For each custom sender (`mailer-name`), there needs to be a verified sender in SendGrid.
 
-### cloudflared
+### Beszel
+
+[Docs](https://www.beszel.dev/guide/environment-variables)
+
+```env
+# beszel.env
+
+# Hub settings
+BESZEL_HUB_APP_URL=
+
+# Agent settings
+BESZEL_AGENT_LISTEN=/beszel_socket/beszel.sock
+BESZEL_AGENT_KEY=''
+```
+
+### Cloudflared
 
 [Docs](https://github.com/cloudflare/cloudflared?tab=readme-ov-file)
 
@@ -119,7 +135,18 @@ Below are the variables that need to be set in the `.env` file for each service.
 TUNNEL_TOKEN=
 ```
 
-### gluetun
+### ConvertX
+
+[Docs](https://github.com/C4illin/ConvertX#environment-variables)
+
+```env
+# convertx.env
+
+JWT_SECRET=
+HTTP_ALLOWED=true
+```
+
+### Gluetun
 
 [Docs](https://github.com/qdm12/gluetun)
 
@@ -147,7 +174,6 @@ My current Immich docker setup has a lot of repetition - when I want to update,
 # immich.env
 
 UPLOAD_LOCATION=/media/immich
-IMMICH_VERSION="v1.123.0"
 
 TYPESENSE_API_KEY=
 DB_PASSWORD=
@@ -164,44 +190,64 @@ POSTGRES_USER=postgres
 POSTGRES_DB=immich
 ```
 
-### Joplin
+### Invidious
 
-[Docs](https://github.com/flosoft/docker-joplin-server)
+[Docs](https://docs.invidious.io/installation/)
+
+Note that the `password` under `db` in `INVIDIOUS_CONFIG` should be the same as the `POSTGRES_PASSWORD`. The `hmac_key` should be a different, randomly generated value
 
 ```env
-# joplin.env
+# invidious.env
 
-APP_PORT=22300
+# Invidious
-APP_BASE_URL=
+INVIDIOUS_CONFIG='
-DB_CLIENT=pg
+    db:
+        dbname: invidious
+        user: invidious
+        password:
+        host: invidious-db
+        port: 5432
+    check_tables: true
+    signature_server: invidious-sighelper:12999
+    visitor_data:
+    po_token:
+    external_port: 9080
+    https_only: false
+    statistics_enabled: false
+    registration_enabled: false
+    popular_enabled: false
+    hmac_key:
+    admins: ["april"]
+    default_user_preferences:
+        quality: dash
+        feed_menu: ["Trending", "Subscriptions", "Playlists"]
+        default_home: Trending
+'
+
+# Database
+POSTGRES_DB=invidious
+POSTGRES_USER=invidious
 POSTGRES_PASSWORD=
-POSTGRES_DATABASE=joplin
-POSTGRES_USER=
-POSTGRES_PORT=5432
-POSTGRES_HOST=joplin-db
 
-# Optional SMTP settings
+# to update the visitor_data and po_token:
-MAILER_ENABLED=1
+# docker run quay.io/invidious/youtube-trusted-session-generator
-MAILER_HOST=
+# or, for use with gluetun:
-MAILER_PORT=465
+# docker run --network=container:gluetun quay.io/invidious/youtube-trusted-session-generator
-MAILER_SECURE=1
-MAILER_AUTH_USER=
-MAILER_AUTH_PASSWORD=
-MAILER_NOREPLY_NAME=
-MAILER_NOREPLY_EMAIL=
 ```
 
-### LinkStack
+### LubeLogger
 
-[Docs](https://linkstack.org/docker/)
+[Docs](https://docs.lubelogger.com/Advanced/Environment%20Variables)
-
-This one just needs the public hostname and admin email.
 
 ```env
-# linkstack.env
+# lubelogger.env
-
+LC_ALL=en_US
-HTTPS_SERVER_NAME=
+LANG=en_US
-SERVER_ADMIN=
+MailConfig__EmailServer=
+MailConfig__EmailFrom=
+MailConfig__Port=587
+MailConfig__Username=
+MailConfig__Password=
 ```
 
 ### Miniflux
@@ -219,6 +265,24 @@ POSTGRES_PASSWORD= # this is the password used above
 POSTGRES_DB=miniflux
 ```
 
+### MultiScrobbler
+
+[Docs](https://foxxmd.github.io/multi-scrobbler/docs/configuration/)
+
+```env
+# scrobbler.env
+
+TZ=America/Chicago
+PUID=1000
+PGID=1000
+MALOJA_URL=http://maloja:42010
+MALOJA_API_KEY=
+JELLYFIN_URL=http://jellyfin:8096
+JELLYFIN_USER=
+JELLYFIN_APIKEY=
+JELLYFIN_USERS_ALLOW=
+```
+
 ### Paperless-ngx
 
 [Docs](https://docs.paperless-ngx.com/setup/#docker)
@@ -252,26 +316,35 @@ PAPERLESS_EMAIL_HOST_PASSWORD=
 PAPERLESS_EMAIL_FROM=
 ```
 
-### Speedtest Tracker
+### PicoShare
 
-[Docs](https://docs.speedtest-tracker.dev/getting-started/installation/using-docker-compose)
+[Docs](https://github.com/mtlynch/picoshare)
 
 ```env
-# speedtest.env
+# picoshare.env
 
-PUID=1000
+PORT=4001
-PGID=1000
+PS_SHARED_SECRET=
+PS_BEHIND_PROXY=true
+```
 
-# Generate with `echo -n 'base64:'; openssl rand -base64 32;` or use the speedtest-tracker website
+### Seafile
-APP_KEY=
 
-# Public address or IP
+[Docs](https://manual.seafile.com/11.0/docker/deploy_seafile_with_docker/)
-APP_URL=
 
-DB_CONNECTION=sqlite
+```env
-APP_TIMEZONE=
+# seafile.env
-DISPLAY_TIMEZONE=
+
-SPEEDTEST_SCHEDULE=0,15,30,45 * * * * # run speedtest every 15 minutes
+DB_HOST=seafile_db
+DB_ROOT_PASSWD=
+SEAFILE_ADMIN_EMAIL=
+SEAFILE_ADMIN_PASSWORD=
+SEAFILE_SERVER_HOSTNAME=
+FORCE_HTTPS_IN_CONF=true
+
+MYSQL_ROOT_PASSWORD= # same as DB_ROOT_PASSWD above
+MYSQL_LOG_CONSOLE=true
+MARIADB_AUTO_UPGRADE=1
 ```
 
 ### Tandoor
@@ -296,7 +369,7 @@ POSTGRES_USER=tandoor
 POSTGRES_PASSWORD=
 ```
 
-### vaultwarden
+### Vaultwarden
 
 [Docs](https://github.com/dani-garcia/vaultwarden)
 
@@ -322,3 +395,35 @@ SMTP_SECURITY=starttls
 SMTP_USERNAME=
 SMTP_PASSWORD=
 ```
+
+### Wallabag
+
+[Docs](https://hub.docker.com/r/wallabag/wallabag/)
+
+The domain name should be set to your Wallabag instance's domain (e.g. links.mysite.com). Server name is just a pretty name for your instance. The DB password and secret can be set to randomly generated strings.
+
+FOSUSER_REGISTRATION must be set to `true` for at least the first run so a user can be created.
+
+Note: The username/password need to be included in the mailer DSN (e.g. smtp://apikey:mykey12345@smtp.sendgrid.net)
+
+```env
+# wallabag.env
+
+SYMFONY__ENV__DOMAIN_NAME=
+SYMFONY__ENV__SERVER_NAME=
+SYMFONY__ENV__DATABASE_PASSWORD=
+SYMFONY__ENV__SECRET=
+SYMFONY__ENV__FOSUSER_REGISTRATION=false
+SYMFONY__ENV__MAILER_DSN=
+SYMFONY__ENV__FROM_EMAIL=
+```
+
+### Workout Tracker
+
+[Docs](https://github.com/jovandeginste/workout-tracker#docker)
+
+```env
+# workout-tracker.env
+
+WT_JWT_ENCRYPTION_KEY=
+```