fix: preserve jellyfin mode across startup and upgrade paths

Author: liamvibecodes

.github/workflows/validate.yml

@@ -41,4 +41,6 @@ jobs:
         run: |
           cp .env.example .env
           docker compose --profile autoupdate --profile music config >/dev/null
+          docker compose --profile jellyfin config >/dev/null
+          docker compose --profile autoupdate --profile music --profile jellyfin config >/dev/null
           rm .env

IMAGE_LOCK.md

@@ -22,6 +22,7 @@ Tested lock snapshot:
 | kometa | `kometateam/kometa@sha256:46fc4bdd6f64dbd92655c6495d9f9d1a745845bd60fa13a7283755db48de8bc0` |
 | qbittorrent | `lscr.io/linuxserver/qbittorrent@sha256:065792d2b11f0facff340210fc1cf13623b029a94ecdf08b02d06d922205f618` |
 | seerr | `ghcr.io/seerr-team/seerr@sha256:1b5fc1ea825631d9d165364472663b817a4c58ef6aa1013f58d82c1570d7c866` |
+| jellyfin (optional) | `lscr.io/linuxserver/jellyfin@sha256:4ee07757abcaa0b74fbc74179392311dc2874c03b0bef04bc2d79e9e1a875793` |
 | tdarr | `ghcr.io/haveagitgat/tdarr@sha256:20a5656c4af4854e1877046294f77113f949d27e35940a9a65f231423d063207` |
 | tidarr (music profile) | `cstaelen/tidarr@sha256:79a2c62aed04dbe9770272443192eae145f26bdc2d188e665b13ab763341206c` |
 

README.md

@@ -158,6 +158,8 @@ bash scripts/setup.sh            # or: bash scripts/setup.sh --media-dir /Volume
 # edit .env with VPN keys
 bash scripts/doctor.sh           # preflight validation before first boot
 docker compose up -d
+# if MEDIA_SERVER=jellyfin in .env:
+docker compose --profile jellyfin up -d
 docker compose --profile autoupdate up -d watchtower  # optional auto-updates
 bash scripts/configure.sh
 bash scripts/install-launchd-jobs.sh

SETUP.md

@@ -318,6 +318,8 @@ bash scripts/vpn-mode.sh nord      # switch to Nord
 **Restart everything:**
 ```bash
 docker compose down && docker compose up -d
+# If using Jellyfin:
+docker compose down && docker compose --profile jellyfin up -d
 ```
 
 **Uninstall automation jobs:**

UPGRADE.md

@@ -68,6 +68,8 @@ bash scripts/doctor.sh
 4. Start and configure:
 ```bash
 docker compose up -d
+# If using Jellyfin:
+docker compose --profile jellyfin up -d
 bash scripts/configure.sh
 bash scripts/install-launchd-jobs.sh
 ```
@@ -94,6 +96,8 @@ docker compose down
 
 cd ~/mac-media-stack
 docker compose up -d
+# If your basic stack uses Jellyfin:
+docker compose --profile jellyfin up -d
 ```
 
 If you used the one-shot script, backup snapshots are saved under:

docker-compose.yml

@@ -227,7 +227,7 @@ services:
     restart: unless-stopped
 
   jellyfin:
-    image: lscr.io/linuxserver/jellyfin:latest
+    image: lscr.io/linuxserver/jellyfin@sha256:4ee07757abcaa0b74fbc74179392311dc2874c03b0bef04bc2d79e9e1a875793
     container_name: jellyfin
     profiles: ["jellyfin"]
     environment:

scripts/refresh-image-lock.sh

@@ -9,8 +9,8 @@ COMPOSE_FILE="$SCRIPT_DIR/docker-compose.yml"
 LOCK_FILE="$SCRIPT_DIR/IMAGE_LOCK.md"
 ENV_FILE="$SCRIPT_DIR/.env"
 
-PROFILES=(autoupdate music)
-OPTIONAL_SERVICES=(watchtower)
+PROFILES=(autoupdate music jellyfin)
+OPTIONAL_SERVICES=(watchtower jellyfin)
 MUSIC_SERVICES=(lidarr tidarr)
 
 for cmd in docker awk sed mktemp; do

scripts/setup.sh

@@ -109,6 +109,7 @@ echo ""
 echo "Next steps:"
 echo "  1. Edit .env and add your VPN keys"
 echo "  2. Run: docker compose up -d"
+echo "     (or: docker compose --profile jellyfin up -d if MEDIA_SERVER=jellyfin)"
 echo "  3. Run: bash scripts/configure.sh"
 echo "  4. Edit config templates with your API keys (see SETUP.md)"
 echo ""

scripts/upgrade-from-basic.sh

@@ -213,6 +213,7 @@ copy_env_key_if_set "$BASIC_ENV" "$ADVANCED_ENV" "PUID"
 copy_env_key_if_set "$BASIC_ENV" "$ADVANCED_ENV" "PGID"
 copy_env_key_if_set "$BASIC_ENV" "$ADVANCED_ENV" "TIMEZONE"
 copy_env_key_if_set "$BASIC_ENV" "$ADVANCED_ENV" "SEERR_BIND_IP"
+copy_env_key_if_set "$BASIC_ENV" "$ADVANCED_ENV" "MEDIA_SERVER"
 
 wg_priv="$(env_get "$BASIC_ENV" "WIREGUARD_PRIVATE_KEY")"
 wg_addr="$(env_get "$BASIC_ENV" "WIREGUARD_ADDRESSES")"
@@ -225,6 +226,12 @@ fi
 chmod 600 "$ADVANCED_ENV"
 log "Advanced .env updated from basic settings"
 
+MEDIA_SERVER="$(env_get "$ADVANCED_ENV" "MEDIA_SERVER")"
+MEDIA_SERVER="${MEDIA_SERVER:-plex}"
+
+BASIC_MEDIA_SERVER="$(env_get "$BASIC_ENV" "MEDIA_SERVER")"
+BASIC_MEDIA_SERVER="${BASIC_MEDIA_SERVER:-plex}"
+
 info "Running advanced preflight checks"
 (cd "$ADVANCED_DIR" && bash scripts/doctor.sh --media-dir "$MEDIA_DIR")
 
@@ -233,7 +240,11 @@ info "Stopping basic stack"
 log "Basic stack stopped"
 
 info "Starting advanced stack"
-(cd "$ADVANCED_DIR" && docker compose up -d)
+if [[ "$MEDIA_SERVER" == "jellyfin" ]]; then
+    (cd "$ADVANCED_DIR" && docker compose --profile jellyfin up -d)
+else
+    (cd "$ADVANCED_DIR" && docker compose up -d)
+fi
 log "Advanced stack started"
 
 info "Running auto-configuration"
@@ -269,12 +280,20 @@ echo ""
 echo "Backup path: $BACKUP_DIR"
 echo ""
 echo "Remaining manual steps:"
-echo "  1. Set Kometa keys in $MEDIA_DIR/config/kometa/config.yml"
-echo "     - PLEX_TOKEN"
-echo "     - TMDB API key"
-echo "  2. Configure Tdarr at http://localhost:8265"
+if [[ "$MEDIA_SERVER" == "plex" ]]; then
+    echo "  1. Set Kometa keys in $MEDIA_DIR/config/kometa/config.yml"
+    echo "     - PLEX_TOKEN"
+    echo "     - TMDB API key"
+    echo "  2. Configure Tdarr at http://localhost:8265"
+else
+    echo "  1. Configure Tdarr at http://localhost:8265"
+fi
 echo ""
 echo "Rollback (if needed):"
 echo "  cd $ADVANCED_DIR && docker compose down"
-echo "  cd $BASIC_DIR && docker compose up -d"
+if [[ "$BASIC_MEDIA_SERVER" == "jellyfin" ]]; then
+    echo "  cd $BASIC_DIR && docker compose --profile jellyfin up -d"
+else
+    echo "  cd $BASIC_DIR && docker compose up -d"
+fi
 echo ""