diff --git a/.github/renovate.json b/.github/renovate.json index a1495908f..3d596d4ac 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -99,17 +99,29 @@ "allowedVersions": "/^4.*.*/" }, { - "matchPackageNames": [ - "emby/embyserver" + "matchFileNames": [ + "apps/emby/4.8.*/*.yml" ], "allowedVersions": "/^4\\.8\\.\\d+\\.\\d+$/" }, { - "matchPackageNames": [ - "amilys/embyserver" + "matchFileNames": [ + "apps/emby/4.9.*/*.yml" + ], + "allowedVersions": "/^4\\.9\\.\\d+\\.\\d+$/" + }, + { + "matchFileNames": [ + "apps/emby-amilys/4.8.*/*.yml" ], "allowedVersions": "/^4\\.8\\.\\d+\\.\\d+$/" }, + { + "matchFileNames": [ + "apps/emby-amilys/4.9.*/*.yml" + ], + "allowedVersions": "/^4\\.9\\.\\d+\\.\\d+$/" + }, { "matchPackageNames": [ "photoprism/photoprism" diff --git a/apps/emby-lovechen/4.8.0.21/data.yml b/apps/emby-amilys/4.9.0.46/data.yml similarity index 100% rename from apps/emby-lovechen/4.8.0.21/data.yml rename to apps/emby-amilys/4.9.0.46/data.yml diff --git a/apps/emby-lovechen/4.8.0.21/docker-compose.yml b/apps/emby-amilys/4.9.0.46/docker-compose.yml similarity index 94% rename from apps/emby-lovechen/4.8.0.21/docker-compose.yml rename to apps/emby-amilys/4.9.0.46/docker-compose.yml index 71d7a1c2a..81157034d 100644 --- a/apps/emby-lovechen/4.8.0.21/docker-compose.yml +++ b/apps/emby-amilys/4.9.0.46/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: emby: - image: lovechen/embyserver:4.8.0.21 + image: amilys/embyserver:4.9.0.46 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -33,7 +33,6 @@ services: - UID=0 - GID=0 - GIDLIST=0 - - NVIDIA_VISIBLE_DEVICES=all - HTTP_PROXY=${HTTP_PROXY:-} - HTTPS_PROXY=${HTTP_PROXY:-} - NO_PROXY=localhost,127.0.0.1,::1 diff --git a/apps/emby-lovechen/4.8.0.21/envs/default.env b/apps/emby-amilys/4.9.0.46/envs/default.env similarity index 100% rename from apps/emby-lovechen/4.8.0.21/envs/default.env rename to apps/emby-amilys/4.9.0.46/envs/default.env diff --git a/apps/emby-lovechen/4.8.0.21/envs/global.env b/apps/emby-amilys/4.9.0.46/envs/global.env similarity index 100% rename from apps/emby-lovechen/4.8.0.21/envs/global.env rename to apps/emby-amilys/4.9.0.46/envs/global.env diff --git a/apps/emby-lovechen/4.8.0.21/scripts/init.sh b/apps/emby-amilys/4.9.0.46/scripts/init.sh similarity index 100% rename from apps/emby-lovechen/4.8.0.21/scripts/init.sh rename to apps/emby-amilys/4.9.0.46/scripts/init.sh diff --git a/apps/emby-lovechen/4.8.0.21/scripts/uninstall.sh b/apps/emby-amilys/4.9.0.46/scripts/uninstall.sh similarity index 100% rename from apps/emby-lovechen/4.8.0.21/scripts/uninstall.sh rename to apps/emby-amilys/4.9.0.46/scripts/uninstall.sh diff --git a/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh b/apps/emby-amilys/4.9.0.46/scripts/upgrade.sh similarity index 100% rename from apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh rename to apps/emby-amilys/4.9.0.46/scripts/upgrade.sh diff --git a/apps/emby-lovechen/README.md b/apps/emby-lovechen/README.md deleted file mode 100644 index 36b51eef7..000000000 --- a/apps/emby-lovechen/README.md +++ /dev/null @@ -1,64 +0,0 @@ -# Emby - -_Emby Media Server 特别版 | AMD64/ARM32/ARM64_ - -**愿你生而自由。** - -Emby是一个主从式架构的媒体服务器软件，可以用来整理服务器上的视频和音频，并将音频和视频流式传输到客户端设备。 - -![Emby](https://file.lifebus.top/imgs/emby_cover.png) - -![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) - -## 简介 - -Emby（原名Media Browser）是一个主从式架构的媒体服务器软件，可以用来整理服务器上的视频和音频，并将音频和视频流式传输到客户端设备。 - -Emby服务器端支持Microsoft Windows、Linux、MacOS、FreeBSD，客户端支持HTML5网页，Android和IOS等移动操作系统，Roku、Amazon Fire -TV、Chromecast和Apple TV等流媒体设备，LG智能电视和三星智能电视等智能电视，以及PlayStation3、PlayStation4、Xbox 360和Xbox -One等游戏机。 - -Emby原本是大部分源代码是开源的，带有部分闭源工具，但是自从3.5.3版本开始变为闭源软件，Jellyfin为Emby开源分支基础上发展来的。 - -## 安装说明 - -### 开启 `投屏服务(DLNA)` 与 `网络唤醒服务(WOL)` 功能 - -开启后，可以在局域网内的设备上投屏观看视频。 需要选择主机网络(host)模式。 - -### 硬件驱动挂载 - -默认仅挂载: `/dev/dri`,如果您的设备不存在硬件驱动，请使用删除完整 `devices` 配置。 - -可以通过 `ls /dev/` 查看存在的设备驱动。 - -```yml -devices: - - /dev/dri:/dev/dri - # - /dev/nvidia0:/dev/nvidia0 - # - /dev/nvidiactl:/dev/nvidiactl - # - /dev/nvidia-modeset:/dev/nvidia-modeset - # - /dev/nvidia-nvswitchctl:/dev/nvidia-nvswitchctl - # - /dev/nvidia-uvm:/dev/nvidia-uvm - # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools - # - /dev/video11:/dev/video11 -``` - -如果您的设备存在其他硬件驱动，可以选择挂载。删除 `# ` 号即可。格式为：`宿主机路径:容器路径`。 - -格式请与 `- /dev/dri:/dev/dri` 保持一致。 - -## 特别版说明 - -额外修改： - -+ 完全离线不需要服务器验证 -+ 搜索相关 -+ 支持单字搜索 -+ 支持模糊搜索 -+ 可直接搜索剧季标题 -+ 去除自动更新 - ---- - -![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/emby-lovechen/data.yml b/apps/emby-lovechen/data.yml deleted file mode 100644 index e066aa375..000000000 --- a/apps/emby-lovechen/data.yml +++ /dev/null @@ -1,14 +0,0 @@ -additionalProperties: - key: emby-lovechen - name: Emby Lovechen版 - tags: - - Media - - Local - shortDescZh: 主从式架构的媒体服务器软件 - shortDescEn: A media server software with master-slave architecture - type: website - crossVersionUpdate: true - limit: 0 - website: https://hub.docker.com/r/lovechen/embyserver - github: https://hub.docker.com/r/lovechen/embyserver - document: https://hub.docker.com/r/lovechen/embyserver diff --git a/apps/emby-lovechen/logo.png b/apps/emby-lovechen/logo.png deleted file mode 100644 index a9d496787..000000000 Binary files a/apps/emby-lovechen/logo.png and /dev/null differ diff --git a/apps/emby/4.9.0.50/data.yml b/apps/emby/4.9.0.50/data.yml new file mode 100644 index 000000000..29deb69b0 --- /dev/null +++ b/apps/emby/4.9.0.50/data.yml @@ -0,0 +1,61 @@ +additionalProperties: + formFields: + - default: "host" + edit: true + envKey: NETWORK_MODE + labelZh: 网络模式 + labelEn: Drive path + required: true + type: select + values: + - label: 主机网络模式 + value: "host" + - label: 桥接网络模式 + value: "bridge" + - label: 无网络模式 + value: "none" + - label: 1panel-network + value: "1panel-network" + - default: 8096 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: 网页端口 + labelEn: WebUI Port + required: true + rule: paramPort + type: number + - default: "/home/emby" + edit: true + envKey: EMBY_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: "" + edit: true + envKey: HTTP_SSL_PROXY + labelZh: HTTP(s) 网络代理 + labelEn: HTTP(s) Proxy + required: false + type: text + - default: "" + edit: true + envKey: CUSTOM_MOUNT_DIRECTORY_1 + labelEn: Custom mount directory 1 + labelZh: 自定义挂载目录 1 + required: false + type: text + - default: "" + edit: true + envKey: CUSTOM_MOUNT_DIRECTORY_2 + labelEn: Custom mount directory 2 + labelZh: 自定义挂载目录 2 + required: false + type: text + - default: "" + edit: true + envKey: CUSTOM_MOUNT_DIRECTORY_3 + labelEn: Custom mount directory 3 + labelZh: 自定义挂载目录 3 + required: false + type: text diff --git a/apps/emby/4.9.0.50/docker-compose.yml b/apps/emby/4.9.0.50/docker-compose.yml new file mode 100644 index 000000000..3cd2eca2b --- /dev/null +++ b/apps/emby/4.9.0.50/docker-compose.yml @@ -0,0 +1,38 @@ +networks: + 1panel-network: + external: true + +services: + emby: + image: emby/embyserver:4.9.0.50 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + network_mode: ${NETWORK_MODE} + ports: + - ${PANEL_APP_PORT_HTTP}:8096 + devices: + - /dev/dri:/dev/dri + # - /dev/nvidia0:/dev/nvidia0 + # - /dev/nvidiactl:/dev/nvidiactl + # - /dev/nvidia-modeset:/dev/nvidia-modeset + # - /dev/nvidia-nvswitchctl:/dev/nvidia-nvswitchctl + # - /dev/nvidia-uvm:/dev/nvidia-uvm + # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools + # - /dev/video11:/dev/video11 + volumes: + - /etc/timezone:/etc/timezone + - /etc/localtime:/etc/localtime + - ${EMBY_ROOT_PATH}/config:/config + - ${EMBY_ROOT_PATH}/mnt:/mnt + - ${CUSTOM_MOUNT_DIRECTORY_1:-./default_mount_1}:${CUSTOM_MOUNT_DIRECTORY_1:-/default_mount_1} + - ${CUSTOM_MOUNT_DIRECTORY_2:-./default_mount_2}:${CUSTOM_MOUNT_DIRECTORY_2:-/default_mount_2} + - ${CUSTOM_MOUNT_DIRECTORY_3:-./default_mount_3}:${CUSTOM_MOUNT_DIRECTORY_3:-/default_mount_3} + environment: + - UID=0 + - GID=0 + - GIDLIST=0 + - HTTP_PROXY=${HTTP_PROXY:-} + - HTTPS_PROXY=${HTTP_PROXY:-} + - NO_PROXY=localhost,127.0.0.1,::1 diff --git a/apps/emby/4.9.0.50/envs/default.env b/apps/emby/4.9.0.50/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/emby/4.9.0.50/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/emby/4.9.0.50/envs/global.env b/apps/emby/4.9.0.50/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/emby/4.9.0.50/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/emby/4.9.0.50/scripts/init.sh b/apps/emby/4.9.0.50/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/emby/4.9.0.50/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/emby/4.9.0.50/scripts/uninstall.sh b/apps/emby/4.9.0.50/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/apps/emby/4.9.0.50/scripts/uninstall.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/emby/4.9.0.50/scripts/upgrade.sh b/apps/emby/4.9.0.50/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/emby/4.9.0.50/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi