update docker cd; folder based

Author: Mafyuh

.github/workflows/CD.yml

@@ -7,12 +7,8 @@ on:
       - "docker/**"
   workflow_dispatch:
     inputs:
-      target_host:
-        description: "Target host (ex. Ubu, ARM, Main)"
-        required: true
-        type: string
       folder:
-        description: "Folder to deploy (ex. jellyfin, arm, all)"
+        description: "Folder to deploy (ex. jellyfin, blocky, geohub)"
         required: true
         type: string
 
@@ -45,44 +41,48 @@ jobs:
           echo "Modified folders: $folders"
           echo "::set-output name=folders::$folders"
 
-      - name: Override Target Host and Folder (Manual Run)
+      - name: Override Folder (Manual Run)
         if: github.event_name == 'workflow_dispatch'
         run: |
-          echo "target_host=${{ github.event.inputs.target_host }}" >> $GITHUB_ENV
           echo "folder=${{ github.event.inputs.folder }}" >> $GITHUB_ENV
 
       - name: Map Folder to Host
-        if: github.event_name != 'workflow_dispatch'
         shell: bash
         run: |
-          IFS=' ' read -r -a folder_array <<< "${{ steps.detect-changes.outputs.folders }}"
+          if [ -n "${folder}" ]; then
+            folder_list="${folder}"
+          else
+            folder_list="${{ steps.detect-changes.outputs.folders }}"
+          fi
+
+          IFS=' ' read -r -a folder_array <<< "$folder_list"
           hosts=""
           folders=""
 
-          for folder in "${folder_array[@]}"; do
-            case $folder in
-              alloy) host="all" ;;
-              arm) host="ARM" ;;
-              caddy) host="proxy" ;;
-              databases) host="docker" ;;
-              downloaders) host="downloaders" ;;
-              geohub) host="Ubu" ;;
-              omni) host="omni" ;;
-              ollama) host="ollama" ;;
+          for f in "${folder_array[@]}"; do
+            case $f in
+              ai) host="ollama" ;;
+              audiobookshelf) host="audiobook-shelf" ;;
               blocky) host="blocky-HA" ;;
+              caddy) host="proxy" ;;
+              couchdb) host="docker" ;;
+              downloaders) host="truenas" ;;
               exporters) host="Ubu" ;;
-              jellyfin) host="Ark-Ripper" ;;
+              geohub) host="Ubu" ;;
+              jellyfin) host="truenas" ;;
               npm) host="Nginx-Proxy-Manager" ;;
+              omni) host="omni" ;;
+              vps) host="racknerd-vps" ;;
               wazuh) host="wazuh" ;;
-              *) echo "Unknown folder: $folder" && exit 1 ;;
+              *) echo "Unknown folder: $f" && exit 1 ;;
             esac
 
             if [ -z "$hosts" ]; then
               hosts="$host"
-              folders="$folder"
+              folders="$f"
             else
               hosts="$hosts,$host"
-              folders="$folders,$folder"
+              folders="$folders,$f"
             fi
           done
 

ansible/ansible.cfg

@@ -3,4 +3,4 @@ ansible_user = mafyuh
 host_key_checking = False
 interpreter_python = /usr/bin/python3
 deprecation_warnings=False
-private_key_file = ~/.ssh/id_ed25519
+private_key_file = ~/.ssh/main

ansible/playbooks/deploy-docker.yml

@@ -25,7 +25,7 @@
 
     - name: Set env_variables
       ansible.builtin.set_fact:
-        env_variables: "{{ secret_mapping[target_host]['env_variables'] | default({}) }}"
+        env_variables: "{{ secret_mapping[folder]['env_variables'] | default({}) }}"
 
     - name: Lookup secrets on the control machine
       ansible.builtin.shell: "bws secret get {{ item }} | jq -r '.value'"

docker/jellyfin/docker-compose.yml

@@ -1,50 +1,27 @@
 ---
 # yaml-language-server: $schema=https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json
+##  Migrated Jellyfin to TrueNAS
 services:
   jellyfin:
     image: jellyfin/jellyfin:10.11.9
     container_name: jellyfin
     user: 1000:1000
     devices:
-      - /dev/dri/renderD129:/dev/dri/renderD129
+      - /dev/dri/renderD128:/dev/dri/renderD128
     volumes:
-      - /docker/appdata/jellyfin/config:/config
-      - /docker/appdata/jellyfin/cache:/nvmecache
-      - /docker/appdata/jellyfin/metadata:/nvmemetadata
-      - /docker/appdata/jellyfin/transcodes:/transcodes
-      - nas:/Media
+      - /mnt/ssd-appdata/appdata/jellyfin/config:/config
+      - /mnt/thePool/thePoolShare/Media:/Media
+      - /mnt/ssd-appdata/appdata/jellyfin:/tmp
+      - /mnt/ssd-appdata/appdata/jellyfin/metadata:/nvmemetadata
+      - /mnt/ssd-appdata/appdata/jellyfin/cache:/nvmecache
+      - /mnt/ssd-appdata/appdata/jellyfin/transcodes:/transcodes
     restart: "unless-stopped"
     group_add:
-      - "104"
+      - "107"
     ports:
       - 8096:8096
     environment:
       - JELLYFIN_DATA_DIR=/config/data
       - JELLYFIN_CONFIG_DIR=/config
       - JELLYFIN_LOG_DIR=/config/log
       - JELLYFIN_CACHE_DIR=/nvmecache
-
-  makemkv:
-    image: jlesage/makemkv:v26.01.2
-    container_name: makemkv
-    ports:
-      - 5800:5800
-    environment:
-      - MAKEMKV_KEY=$MAKEMKV_KEY
-    volumes:
-      - /docker/appdata/makemkv:/config:rw
-      - /home/mafyuh/makemkv/storage:/storage:rw
-      - nas:/output:rw
-    devices:
-      - /dev/sr0:/dev/sr0
-    privileged: true
-    security_opt:
-      - apparmor:unconfined
-
-volumes:
-  nas:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=nas.lan,vers=4,rw
-      device: ":/mnt/thePool/thePoolShare/Media"