diff --git a/apps/emby-amilys/4.9.0.20/.env.sample b/apps/emby-amilys/4.9.0.20/.env.sample new file mode 100644 index 00000000..e54cee38 --- /dev/null +++ b/apps/emby-amilys/4.9.0.20/.env.sample @@ -0,0 +1,7 @@ +CONTAINER_NAME="emby-amilys" +DATA_PATH="./data/config" +MOUNT_PATH2="./data/mnt2" +MOUNT_PATH="./data/mnt1" +PANEL_APP_PORT_HTTP="40258" +PANEL_APP_PORT_HTTPS="40259" +TIME_ZONE="Asia/Shanghai" diff --git a/apps/emby-amilys/4.9.0.20/data.yml b/apps/emby-amilys/4.9.0.20/data.yml new file mode 100644 index 00000000..f09e681f --- /dev/null +++ b/apps/emby-amilys/4.9.0.20/data.yml @@ -0,0 +1,46 @@ +additionalProperties: + formFields: + - default: 40258 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: HTTP Port + labelZh: HTTP 端口 + required: true + rule: paramPort + type: number + - default: 40259 + edit: true + envKey: PANEL_APP_PORT_HTTPS + labelEn: HTTPS Port + labelZh: HTTPS 端口 + required: true + rule: paramPort + type: number + - default: ./data/config + edit: true + envKey: DATA_PATH + labelEn: Data folder path + labelZh: 数据文件夹路径 + required: true + type: text + - default: ./data/mnt1 + edit: true + envKey: MOUNT_PATH + labelEn: Mount folder path + labelZh: 挂载文件夹路径 + required: true + type: text + - default: ./data/mnt2 + edit: true + envKey: MOUNT_PATH2 + labelEn: Mount folder path 2 + labelZh: 挂载文件夹路径2 + required: true + type: text + - default: Asia/Shanghai + edit: true + envKey: TIME_ZONE + labelEn: Time zone + labelZh: 时区 + required: true + type: text \ No newline at end of file diff --git a/apps/emby-amilys/4.9.0.20/docker-compose.yml b/apps/emby-amilys/4.9.0.20/docker-compose.yml new file mode 100644 index 00000000..17224734 --- /dev/null +++ b/apps/emby-amilys/4.9.0.20/docker-compose.yml @@ -0,0 +1,30 @@ +services: + emby-amilys: + container_name: ${CONTAINER_NAME} + restart: always + networks: + - 1panel-network + ports: + - "${PANEL_APP_PORT_HTTP}:8096" + - "${PANEL_APP_PORT_HTTPS}:8920" + volumes: + - "${DATA_PATH}:/config" + - "${MOUNT_PATH}:/mnt/share1" + - "${MOUNT_PATH2}:/mnt/share2" + environment: + - UID=1000 + - GID=1000 + - GIDLIST=1000,0 + - TZ=${TIME_ZONE} + # - NVIDIA_VISIBLE_DEVICES=all # 映射NVIDIA显卡 + # - NVIDIA_DRIVER_CAPABILITIES=all # 映射NVIDIA显卡 + #runtime: nvidia # Expose NVIDIA GPUs + devices: + - /dev/dri:/dev/dri # VAAPI/NVDEC/NVENC render nodes + #- /dev/vchiq:/dev/vchiq # MMAL/OMX on Raspberry Pi + image: amilys/embyserver:4.9.0.20 + labels: + createdBy: "Apps" +networks: + 1panel-network: + external: true diff --git a/apps/emby-amilys/README.md b/apps/emby-amilys/README.md index feafa996..77779575 100644 --- a/apps/emby-amilys/README.md +++ b/apps/emby-amilys/README.md @@ -1,25 +1,23 @@ -### 自供更新 +## 使用说明 -时间 2024/06/01 -beta v4.9.0.22 -latest v4.8.8.0 > 如果需要显卡加速，安装的时候，请选择编辑`compose`文件，然后编辑显卡加速相关的配置。 +*** 已添加功能： ## 1. emby-erx Emby 增强/美化 插件 -![QQ截图20230830201336.png](https://cdn.ssr0.cn:433/usr/uploads/2023/08/2955749398.png) 作者：[https://github.com/Nolovenodie/emby-crx](https://github.com/Nolovenodie/emby-crx) +- 作者：[https://github.com/Nolovenodie/emby-crx](https://github.com/Nolovenodie/emby-crx) 开启请在/config/config/ext.sh 添加媒体库ID 再重启容器和Ctrl+F5刷新网页 ## 2. dd-danmaku Emby 弹幕库插件 -![QQ截图20230830201336.png](https://raw.githubusercontent.com/RyoLee/emby-danmaku/res/S0.png) 作者：[https://github.com/RyoLee/dd-danmaku](https://github.com/RyoLee/dd-danmaku) +- 作者：[https://github.com/RyoLee/dd-danmaku](https://github.com/RyoLee/dd-danmaku) 开启/关闭 请在/config/config/ext.sh 中设置 ## 3. emby调用外部播放器 -![截图](https://raw.githubusercontent.com/bpking1/pics/main/img/20230206220108.png) 作者：[https://github.com/bpking1/embyExternalUrl](https://github.com/bpking1/embyExternalUrl) 开启/关闭 请在/config/config/ext.sh 中设置 +- 作者：[https://github.com/bpking1/embyExternalUrl](https://github.com/bpking1/embyExternalUrl) 开启/关闭 请在/config/config/ext.sh 中设置 安卓与电视客户端：[http://res.ssr0.cn:8000/?/Emby/](http://res.ssr0.cn:8000/?/Emby/) @@ -62,19 +60,3 @@ sed -i '/\ extmod/s/\[.*\]/'$extmod'/g' /system/dashboard-ui/ext.js exit 0 ``` - -## 食用方法： - -- 1.群晖docker注册表中搜索选择镜像版本 -- 2.勾选(Privileged)高权限启动容器！！！(不用更改环境变量） -- 3.映射目录`/docker/emby`映射到`/config` -- 4.Emby设置-\>Emby Premiere：输入`疯狂星期四V我50`点下保存 -- 5.`刷新浏览器`网页开始食用 -- 6.电视直播：添加直播源后,再手动刷新一下指南数据 -- 7.群晖ssh清理过时镜像`docker image prune` - -## 同版本更新方法 -- 1.群晖Docker中停止emby容器 -- 2.Docker注册表中搜索选择镜像版本更新 -- 3.群晖Docker -\> 容器 -\> 操作-\> 重置 emby容器 -- 4.启动emby容器，刷新浏览器 \ No newline at end of file diff --git a/apps/emby-amilys/data.yml b/apps/emby-amilys/data.yml index 204ec428..3802a8c1 100644 --- a/apps/emby-amilys/data.yml +++ b/apps/emby-amilys/data.yml @@ -1,14 +1,14 @@ -name: Emby Amilys版 +name: Amilys Emby Server tags: - 多媒体 -title: 一个免费的个人媒体服务器(开心版) -description: 一个免费的个人媒体服务器 +title: 一个免费的个人媒体服务器 (开心版) +description: 一个免费的个人媒体服务器 (开心版) additionalProperties: - key: embyamilys - name: Emby Amilys版 + key: emby-amilys + name: Amilys Emby Server tags: - Media - shortDescZh: 一个免费的个人媒体服务器 + shortDescZh: 一个免费的个人媒体服务器 (开心版) shortDescEn: A free personal media server type: tool crossVersionUpdate: true diff --git a/apps/emby-amilys/latest/.env.sample b/apps/emby-amilys/latest/.env.sample index b6ff54ac..e54cee38 100644 --- a/apps/emby-amilys/latest/.env.sample +++ b/apps/emby-amilys/latest/.env.sample @@ -1,5 +1,7 @@ CONTAINER_NAME="emby-amilys" DATA_PATH="./data/config" -MOUNT_PATH="./data/mnt" -PANEL_APP_PORT_HTTP="8098" -PANEL_APP_PORT_HTTPS="8922" +MOUNT_PATH2="./data/mnt2" +MOUNT_PATH="./data/mnt1" +PANEL_APP_PORT_HTTP="40258" +PANEL_APP_PORT_HTTPS="40259" +TIME_ZONE="Asia/Shanghai" diff --git a/apps/emby-amilys/latest/data.yml b/apps/emby-amilys/latest/data.yml index 5eb5c627..f09e681f 100644 --- a/apps/emby-amilys/latest/data.yml +++ b/apps/emby-amilys/latest/data.yml @@ -1,18 +1,18 @@ additionalProperties: formFields: - - default: 8098 + - default: 40258 edit: true envKey: PANEL_APP_PORT_HTTP labelEn: HTTP Port - labelZh: HTTP端口 + labelZh: HTTP 端口 required: true rule: paramPort type: number - - default: 8922 + - default: 40259 edit: true envKey: PANEL_APP_PORT_HTTPS labelEn: HTTPS Port - labelZh: HTTPS端口 + labelZh: HTTPS 端口 required: true rule: paramPort type: number @@ -23,10 +23,24 @@ additionalProperties: labelZh: 数据文件夹路径 required: true type: text - - default: ./data/mnt + - default: ./data/mnt1 edit: true envKey: MOUNT_PATH labelEn: Mount folder path labelZh: 挂载文件夹路径 required: true + type: text + - default: ./data/mnt2 + edit: true + envKey: MOUNT_PATH2 + labelEn: Mount folder path 2 + labelZh: 挂载文件夹路径2 + required: true + type: text + - default: Asia/Shanghai + edit: true + envKey: TIME_ZONE + labelEn: Time zone + labelZh: 时区 + required: true type: text \ No newline at end of file diff --git a/apps/emby-amilys/latest/docker-compose.yml b/apps/emby-amilys/latest/docker-compose.yml index 153f4006..57fee39f 100644 --- a/apps/emby-amilys/latest/docker-compose.yml +++ b/apps/emby-amilys/latest/docker-compose.yml @@ -1,5 +1,5 @@ services: - emby: + emby-amilys: container_name: ${CONTAINER_NAME} restart: always networks: @@ -9,12 +9,13 @@ services: - "${PANEL_APP_PORT_HTTPS}:8920" volumes: - "${DATA_PATH}:/config" - - "${MOUNT_PATH}:/mnt/media" + - "${MOUNT_PATH}:/mnt/share1" + - "${MOUNT_PATH2}:/mnt/share2" environment: - UID=1000 - GID=1000 - GIDLIST=1000,0 - - TZ=Asia/Shanghai + - TZ=${TIME_ZONE} # - NVIDIA_VISIBLE_DEVICES=all # 映射NVIDIA显卡 # - NVIDIA_DRIVER_CAPABILITIES=all # 映射NVIDIA显卡 #runtime: nvidia # Expose NVIDIA GPUs diff --git a/apps/emby-amilys/logo.png b/apps/emby-amilys/logo.png index 4dad0846..ce55fb09 100644 Binary files a/apps/emby-amilys/logo.png and b/apps/emby-amilys/logo.png differ