diff --git a/.github/workflows/renovate-app-version.sh b/.github/workflows/renovate-app-version.sh index 3b5f8d604..b15c6dcb1 100644 --- a/.github/workflows/renovate-app-version.sh +++ b/.github/workflows/renovate-app-version.sh @@ -54,6 +54,19 @@ process_image() { return fi + # Match date version + date_version=$(echo "$trimmed_version" | grep -oE '[0-9]{2}-[0-9]{2}-[0-9]{2}') + if [[ -n "$date_version" ]]; then + if [[ "$found_alpine" == true ]]; then + cleaned_version="$date_version-alpine" + echo "Mini Date alpine version: $date_version" + else + cleaned_version=$date_version + echo "Mini Date version: $date_version" + fi + return + fi + # Match number version number_version=$(echo "$trimmed_version" | grep -oE '[0-9]+(\.[0-9]+){0,3}' | head -n1) if [[ -n "$number_version" ]]; then diff --git a/apps/aria2-superng6/24-11-01/data.yml b/apps/aria2-superng6/24-11-01/data.yml new file mode 100644 index 000000000..10ae84f9a --- /dev/null +++ b/apps/aria2-superng6/24-11-01/data.yml @@ -0,0 +1,110 @@ +additionalProperties: + formFields: + - default: "/home/aria2" + edit: true + envKey: ARIA2_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 8080 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: 6800 + edit: true + envKey: PANEL_APP_PORT_RPC + labelZh: RPC 通讯端口 + labelEn: RPC communication port + required: true + rule: paramPort + type: number + - default: 32516 + edit: true + envKey: PANEL_APP_PORT_BTPORT + labelZh: DHT 和 BT 通讯端口 + labelEn: DHT and BT communication port + required: true + rule: paramPort + type: number + - default: "" + edit: true + envKey: SECRET + labelZh: 鉴权密钥 + labelEn: Authentication key + required: true + type: password + - default: "1024M" + edit: true + envKey: CACHE + labelZh: 写入缓存大小 + labelEn: Write cache size + required: true + type: text + - default: "https://cdn.jsdelivr.net/gh/XIU2/TrackersListCollection@master/best_aria2.txt" + edit: true + envKey: CTU + labelZh: 自定义 Trackes 地址 + labelEn: Custom Trackes address + required: true + type: text + - default: "falloc" + edit: true + envKey: FA + labelZh: 下载预分配模式 + labelEn: Download pre-allocation mode + required: true + type: select + values: + - label: 无 + value: "none" + - label: 预分配 + value: "falloc" + - label: 分片 + value: "trunc" + - label: 预分配 + 分片 + value: "prealloc" + - default: "2h" + edit: true + envKey: CRA2B + labelZh: 重启Aria2B时间 + labelEn: Restart Aria2B time + required: true + type: select + values: + - label: 禁止重启 + value: "false" + - label: 每1小时 + value: "1h" + - label: 每2小时 + value: "2h" + - label: 每3小时 + value: "3h" + - label: 每4小时 + value: "4h" + - label: 每5小时 + value: "5h" + - label: 每6小时 + value: "6h" + - label: 每8小时 + value: "8h" + - label: 每10小时 + value: "10h" + - label: 每12小时 + value: "12h" + - default: "true" + edit: true + envKey: QUIET + labelZh: 静默下载 + labelEn: Silent download + required: true + type: select + values: + - label: 禁用 + value: "false" + - label: 开启 + value: "true" diff --git a/apps/aria2-superng6/24-11-01/docker-compose.yml b/apps/aria2-superng6/24-11-01/docker-compose.yml new file mode 100644 index 000000000..873661c55 --- /dev/null +++ b/apps/aria2-superng6/24-11-01/docker-compose.yml @@ -0,0 +1,38 @@ +networks: + 1panel-network: + external: true +services: + aria2-superng6: + image: superng6/aria2:a2b-stable-24-11-01 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + network_mode: ${NETWORK_MODE} + cap_add: + - NET_ADMIN + ports: + - ${PANEL_APP_PORT_HTTP}:8080 + - ${PANEL_APP_PORT_RPC}:6800 + - ${PANEL_APP_PORT_BTPORT}:32516 + - ${PANEL_APP_PORT_BTPORT}:32516/udp + env_file: + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${ENV_FILE:-/etc/1panel/envs/default.env} + volumes: + - ${ARIA2_ROOT_PATH}/downloads:/downloads + - ${ARIA2_ROOT_PATH}/config:/config + - /lib/modules:/lib/modules + environment: + - PUID=0 + - PGID=0 + - UMASK=022 + - WEBUI=true + - WEBUI_PORT=${PANEL_APP_PORT_HTTP} + - BTPORT=${PANEL_APP_PORT_BTPORT} + - PORT=${PANEL_APP_PORT_RPC} + - UT=true + - RUT=true + - SMD=true + - CRA2B=2h + - QUIET=true diff --git a/apps/aria2-superng6/24-11-01/envs/default.env b/apps/aria2-superng6/24-11-01/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/aria2-superng6/24-11-01/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/aria2-superng6/24-11-01/envs/global.env b/apps/aria2-superng6/24-11-01/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/aria2-superng6/24-11-01/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/aria2-superng6/24-11-01/scripts/init.sh b/apps/aria2-superng6/24-11-01/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/aria2-superng6/24-11-01/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/aria2-superng6/24-11-01/scripts/uninstall.sh b/apps/aria2-superng6/24-11-01/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/apps/aria2-superng6/24-11-01/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/aria2-superng6/24-11-01/scripts/upgrade.sh b/apps/aria2-superng6/24-11-01/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/aria2-superng6/24-11-01/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 diff --git a/apps/aria2-superng6/README.md b/apps/aria2-superng6/README.md new file mode 100644 index 000000000..4d9a4bc19 --- /dev/null +++ b/apps/aria2-superng6/README.md @@ -0,0 +1,44 @@ +# Aria2 Superng6版 + +一个支持多种存储的文件列表程序 + +![Aria2](https://file.lifebus.top/imgs/aria2_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) + +## 优化亮点 + ++ 全平台架构x86-64、arm64、armhf,统一latest tag ++ 做了usermapping,使用你自己的账户权限来运行,这点对于群辉来说尤其重要 ++ `a2b-latest镜像` 可屏蔽迅雷、qq旋风、影音先锋、百度网盘等吸血客户端A2B=true(集成自@makeding/aria2b,感谢) ++ 纯aria2,没有包含多于的服务 ++ 超小镜像体积 10.77 MB ++ 可以自定义任意二级目录 ++ 开放了BT下载DTH监听端口、BT下载监听端口(TCP/UDP 6881),加快下载速度 ++ 默认开启DHT并且创建了DHT文件,加速下载 ++ 包含了下载完成后自动删除.aria2文件脚本 ++ 包含了执行删除正在下载任务事时自动执行删除文件 ++ 内置最优的aria2配置文件 ++ 内置400多条最新trackers ++ 每天自动更新trackers,不需要重启aria2即可生效 ++ 默认上海时区 `Asia/Shanghai` ++ 直接设置token,不需要在配置文件里修改 ++ 最新静态编译版的 `aria2c1.3.5` ++ 解除aria2c下载线程限制 ++ 支持自动更新tracker,每次启动容器时会自动更新tracker ++ 手动设置磁盘缓存CACHE,默认参数128M ++ 可选则开启回收站,删除文件后移动至回收站,防止丢失文件 ++ 可选下载任务完成后,保留目录结构移动文件 ++ 相对来说最完善的任务处理脚本 ++ 更多可手动调节参数,大量选项不需要修改conf文件 ++ 全平台镜像统一tag + +## 使用说明 + +### 修改配置 + +请前往持久化目录:`config` 目录下修改配置文件 + +--- + +![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/aria2-superng6/data.yml b/apps/aria2-superng6/data.yml new file mode 100644 index 000000000..3b1071f57 --- /dev/null +++ b/apps/aria2-superng6/data.yml @@ -0,0 +1,15 @@ +additionalProperties: + key: aria2-superng6 + name: Aria2 Superng6版 + tags: + - WebSite + - Tool + - Local + shortDescZh: Docker Aria2的最佳实践 + shortDescEn: Docker Aria2's best practice + type: website + crossVersionUpdate: true + limit: 0 + website: https://github.com/SuperNG6/docker-aria2/ + github: https://github.com/aria2/aria2/ + document: https://github.com/SuperNG6/docker-aria2/ diff --git a/apps/aria2-superng6/logo.png b/apps/aria2-superng6/logo.png new file mode 100644 index 000000000..cda80004b Binary files /dev/null and b/apps/aria2-superng6/logo.png differ