From 30553978ef26367c8db32d619c91bcf4664a1def Mon Sep 17 00:00:00 2001
From: monlor <me@monlor.com>
Date: Wed, 29 May 2024 21:05:12 +0800
Subject: [PATCH] =?UTF-8?q?docs:=20=E2=9C=8F=EF=B8=8F=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 22 ++++++++++++++----
 ...compose-emby.yml => docker-compose-all.yml | 23 ++++++++++++++++++-
 docker-compose.yml                            | 23 +------------------
 3 files changed, 40 insertions(+), 28 deletions(-)
 rename docker-compose-emby.yml => docker-compose-all.yml (74%)

diff --git a/README.md b/README.md
index 5dd6a8f..f1eae9d 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,36 @@
 ## 小雅影视库部署增强版
 
-所有脚本集成到 Docker 镜像，避免污染系统环境
+🚀 使用 Docker Compose 一键部署服务
 
-使用 Docker Compose 一键部署服务
+✨ 部署alist+下载emby/jellyfin元数据+部署emby/jellyfin服务全流程自动，无需人工干预
+
+* 所有脚本集成到 Docker 镜像，避免污染系统环境
+* 合并jellyfin和emby的x86和arm镜像，部署时无需区分镜像名
+* 集成清理脚本到alist服务，无需单独部署
+* 通过环境变量配置阿里云盘token，无需映射文件
+* 元数据下载的流程集成到glue服务，自动下载
+* jellyfin和emby启动时自动进行依赖检查，等待元数据下载完成，自动添加hosts
 
 ## 部署
 
-根据你的需求修改配置文件 docker-compose.yml，默认部署alist+emby+jellyfin
+下载并修改配置文件 docker-compose.yml，默认配置部署alist+emby
+
+部署emby大概要下载元数据60G，需要耐心等待下载完成
 
 小雅alist的环境变量配置看[这里](/alist)
 
 ```bash
+mkdir /opt/xiaoya && cd /opt/xiaoya
+# 下载compose配置，修改变量ALIYUN_TOKEN，ALIYUN_OPEN_TOKEN，ALIYUN_FOLDER_ID
+curl -LO https://raw.githubusercontent.com/monlor/docker-xiaoya/main/docker-compose.yml
 docker compose up -d
 ```
 
 ## 配置示例
 
-* [只部署小雅alist](/docker-compose-alist.yml)
-* [部署小雅alist+emby](/docker-compose-emby.yml)
+* [只部署小雅alist+emby](/docker-compose-alist.yml)
 * [部署小雅alist+jellyfin](/docker-compose-jellyfin.yml)
+* [部署小雅alist+emby+jellyfin](/docker-compose-all.yml)
 
 ## 参考
 
diff --git a/docker-compose-emby.yml b/docker-compose-all.yml
similarity index 74%
rename from docker-compose-emby.yml
rename to docker-compose-all.yml
index 3f6708d..1a0bbca 100644
--- a/docker-compose-emby.yml
+++ b/docker-compose-all.yml
@@ -27,7 +27,7 @@ services:
       - LANG=C.UTF-8
       - ALIST_ADDR=http://alist:80
       - EMBY_ENABLED=true
-      - JELLYFIN_ENABLED=false
+      - JELLYFIN_ENABLED=true
     volumes:
       - xiaoya:/etc/xiaoya
       - media:/media/xiaoya
@@ -60,6 +60,27 @@ services:
     restart: unless-stopped
     networks:
       - default
+  jellyfin:
+    image: ghcr.io/monlor/xiaoya-jellyfin
+    container_name: jellyfin
+    environment:
+      - TZ=Asia/Shanghai
+      - ALIST_DOMAIN=alist
+    privileged: true
+    devices:
+      - /dev/dri:/dev/dri
+    depends_on:
+      - glue
+      - alist
+    volumes:
+      - media:/media
+      - config:/config
+      - cache:/cache
+    ports:
+      - 6096:8096
+    restart: unless-stopped
+    networks:
+      - default
 
 networks:
   default:
diff --git a/docker-compose.yml b/docker-compose.yml
index 1a0bbca..3f6708d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       - LANG=C.UTF-8
       - ALIST_ADDR=http://alist:80
       - EMBY_ENABLED=true
-      - JELLYFIN_ENABLED=true
+      - JELLYFIN_ENABLED=false
     volumes:
       - xiaoya:/etc/xiaoya
       - media:/media/xiaoya
@@ -60,27 +60,6 @@ services:
     restart: unless-stopped
     networks:
       - default
-  jellyfin:
-    image: ghcr.io/monlor/xiaoya-jellyfin
-    container_name: jellyfin
-    environment:
-      - TZ=Asia/Shanghai
-      - ALIST_DOMAIN=alist
-    privileged: true
-    devices:
-      - /dev/dri:/dev/dri
-    depends_on:
-      - glue
-      - alist
-    volumes:
-      - media:/media
-      - config:/config
-      - cache:/cache
-    ports:
-      - 6096:8096
-    restart: unless-stopped
-    networks:
-      - default
 
 networks:
   default: