fix: 修正qBitorrent端口映射问题及jellyfin镜像错误 (#70)

* '添加qBittorrent,jellyfin,ALS,alist,watchtower' * 添加flarum到应用商店 * 添加flarum到list * 更新flarum的一些说明 * 更新flarum logo * 添加重启参数 * 规范化 * 修正qBittorrent * 移除无用项 * 修正错误 * 修正细节
2023-05-05 11:24:39 +08:00 · 2023-05-05 11:24:39 +08:00 · 3eee784387
commit 3eee784387
parent ccaec3808c
13 changed files with 22 additions and 241 deletions
--- a/apps/jellyfin/versions/unstable/docker-compose.yml
+++ b/apps/jellyfin/versions/unstable/docker-compose.yml
@ -11,7 +11,7 @@ services:
        - "./data/config:/config"
        - "${CACHE_FOLDER_PATH}:/cache"
        - "${MEDIA_FOLDER_PATH}:/media/media"
-    image: "jellyfinjellyfinunstable"
+    image: "jellyfin/jellyfin:unstable"
    labels:  
      createdBy: "Apps"
   
--- a/apps/list.json
+++ b/apps/list.json
@ -351,7 +351,7 @@
      "key": "qBittorrent",
      "name": "qBittorrent",
      "tags": ["Tool"],
-      "versions": ["4.3.5","4.5.2","latest"],
+      "versions": ["4.3.5","4.5.2"],
      "shortDescZh": "qBittorrent是一个跨平台的开源BitTorrent客户端",
      "shortDescEn": "qBittorrent is a cross-platform open source BitTorrent client",
      "type": "tool",
@ -380,8 +380,8 @@
      "name": "alist",
      "tags": ["Tool"],
      "versions": ["3.16.3"],
-      "shortDescZh": "一个支持多存储的文件列表程序。",
-      "shortDescEn": "A file list program that supports multiple storage.",
+      "shortDescZh": "一个支持多存储的文件列表程序",
+      "shortDescEn": "A file list program that supports multiple storage",
      "type": "tool",
      "limit": 0,
      "crossVersionUpdate": true,
@ -394,8 +394,8 @@
      "name": "watchtower",
      "tags": ["Tool"],
      "versions": ["1.5.3"],
-      "shortDescZh": "自动更新Docker容器基础镜像的工具。",
-      "shortDescEn": "Tool to automatically update Docker container base images.",
+      "shortDescZh": "自动更新Docker容器基础镜像的工具",
+      "shortDescEn": "Tool to automatically update Docker container base images",
      "type": "tool",
      "limit": 1,
      "crossVersionUpdate": false,
@ -408,8 +408,8 @@
      "name": "flarum",
      "tags": ["WebSite"],
      "versions": ["1.7.1"],
-      "shortDescZh": "新一代的论坛软件，使在线讨论变得有趣。",
-      "shortDescEn": "The next-generation forum software that makes online discussion fun.",
+      "shortDescZh": "新一代的论坛软件，使在线讨论变得有趣",
+      "shortDescEn": "The next-generation forum software that makes online discussion fun",
      "type": "website",
      "limit": 0,
      "crossVersionUpdate": true,
--- a/apps/qBittorrent/versions/4.3.5/data/.config/qBittorrent/qBittorrent.conf
+++ b/apps/qBittorrent/versions/4.3.5/data/.config/qBittorrent/qBittorrent.conf
@ -26,7 +26,7 @@ Bittorrent\MaxUploads=-1
 Bittorrent\MaxUploadsPerTorrent=-1
 Bittorrent\PeX=false
 Bittorrent\uTP_rate_limited=false
-Connection\PortRangeMin=40150
+Connection\PortRangeMin=
 Connection\ResolvePeerCountries=true
 Downloads\SavePath=/data/downloads
 Downloads\ScanDirsV2=@Variant(\0\0\0\x1c\0\0\0\0)
@ -62,7 +62,7 @@ WebUI\HTTPS\KeyPath=
 WebUI\HostHeaderValidation=true
 WebUI\LocalHostAuth=true
 WebUI\MaxAuthenticationFailCount=5
-WebUI\Port=40155
+WebUI\Port=
 WebUI\RootFolder=
 WebUI\SecureCookie=true
 WebUI\ServerDomains=*
--- a/apps/qBittorrent/versions/4.3.5/docker-compose.yml
+++ b/apps/qBittorrent/versions/4.3.5/docker-compose.yml
@ -8,12 +8,12 @@ services:
    environment:
        - UID=1000
        - GID=1000
-        - PEER_PORT=40150
-        - WEB_PORT=40155
+        - PEER_PORT=${PEER_PORT_VALUE}
+        - WEB_PORT=${PANEL_APP_PORT_HTTP}
    ports:
-        - "${PEER_PORT_VALUE}:40150"
-        - "${PEER_PORT_VALUE}:40150/udp"
-        - "${PANEL_APP_PORT_HTTP}:40155"
+        - "${PEER_PORT_VALUE}:${PEER_PORT_VALUE}"
+        - "${PEER_PORT_VALUE}:${PEER_PORT_VALUE}/udp"
+        - "${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP}"
    volumes:
        - "./data/.config:/data/.config"
        - "./data/.local:/data/.local"
--- a/apps/qBittorrent/versions/4.5.2/data/.config/qBittorrent/qBittorrent.conf
+++ b/apps/qBittorrent/versions/4.5.2/data/.config/qBittorrent/qBittorrent.conf
@ -26,7 +26,7 @@ Bittorrent\MaxUploads=-1
 Bittorrent\MaxUploadsPerTorrent=-1
 Bittorrent\PeX=false
 Bittorrent\uTP_rate_limited=false
-Connection\PortRangeMin=40150
+Connection\PortRangeMin=
 Connection\ResolvePeerCountries=true
 Downloads\SavePath=/data/downloads
 Downloads\ScanDirsV2=@Variant(\0\0\0\x1c\0\0\0\0)
@ -62,7 +62,7 @@ WebUI\HTTPS\KeyPath=
 WebUI\HostHeaderValidation=true
 WebUI\LocalHostAuth=true
 WebUI\MaxAuthenticationFailCount=5
-WebUI\Port=40155
+WebUI\Port=
 WebUI\RootFolder=
 WebUI\SecureCookie=true
 WebUI\ServerDomains=*
--- a/apps/qBittorrent/versions/4.5.2/docker-compose.yml
+++ b/apps/qBittorrent/versions/4.5.2/docker-compose.yml
@ -8,12 +8,12 @@ services:
    environment:
        - UID=1000
        - GID=1000
-        - PEER_PORT=40150
-        - WEB_PORT=40155
+        - PEER_PORT=${PEER_PORT_VALUE}
+        - WEB_PORT=${PANEL_APP_PORT_HTTP}
    ports:
-        - "${PEER_PORT_VALUE}:40150"
-        - "${PEER_PORT_VALUE}:40150/udp"
-        - "${PANEL_APP_PORT_HTTP}:40155"
+        - "${PEER_PORT_VALUE}:${PEER_PORT_VALUE}"
+        - "${PEER_PORT_VALUE}:${PEER_PORT_VALUE}/udp"
+        - "${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP}"
    volumes:
        - "./data/.config:/data/.config"
        - "./data/.local:/data/.local"
--- a/apps/qBittorrent/versions/latest/README.md
+++ b/apps/qBittorrent/versions/latest/README.md
@ -1,73 +0,0 @@
-
-# 本应用介绍
-
-基于镜像
-> - https://hub.docker.com/r/jarylc/qbittorrent
-
- 数据目录："./data"
- 默认账号：admin
- 密码：adminadmin
- 开启中文，默认为PT下载做的设置，但未优化参数。
-
-> 原项目相关
->> - https://www.qbittorrent.org/
->> - https://github.com/qbittorrent/qBittorrent
-
-# 原项目介绍
-
- qBittorrent是一个跨平台的开源、自由的BitTorrent客户端，其图形用户界面是通过Qt所写，后端使用libtorrent。
- 由贝尔福- 蒙贝利亚尔理工大学的克里斯托夫·迪梅，在2006年3月开始开发。
-
-qBittorrent - A BitTorrent client in Qt
------------------------------------------
-
-[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/qbittorrent/qBittorrent?branch=master&svg=true)](https://ci.appveyor.com/project/qbittorrent/qBittorrent)
-[![GitHub Actions CI Status](https://github.com/qbittorrent/qBittorrent/workflows/GitHub%20Actions%20CI/badge.svg)](https://github.com/qbittorrent/qBittorrent/actions)
-[![Coverity Status](https://scan.coverity.com/projects/5494/badge.svg)](https://scan.coverity.com/projects/5494)
-********************************
-### Description:
-qBittorrent is a bittorrent client programmed in C++ / Qt that uses
-libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.
-
-It aims to be a good alternative to all other bittorrent clients
-out there. qBittorrent is fast, stable and provides unicode
-support as well as many features.
-
-The free [IP to Country Lite database](https://db-ip.com/db/download/ip-to-country-lite) by [DB-IP](https://db-ip.com/) is used for resolving the countries of peers. The database is licensed under the [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/).
-
-### Installation:
-For installation, follow the instructions from INSTALL file, but simple:
-
-```
-./configure
-make && make install
-qbittorrent
-```
-
-will install and execute qBittorrent hopefully without any problem.
-
-### Public key:
-Starting from v3.3.4 all source tarballs and binaries are signed.<br />
-The key currently used is 4096R/[5B7CC9A2](https://pgp.mit.edu/pks/lookup?op=get&search=0x6E4A2D025B7CC9A2) with fingerprint `D8F3DA77AAC6741053599C136E4A2D025B7CC9A2`.<br />
-You can also download it from [here](https://github.com/qbittorrent/qBittorrent/raw/master/5B7CC9A2.asc).<br />
-**PREVIOUSLY** the following key was used to sign the v3.3.4 source tarballs and v3.3.4 Windows installer **only**: 4096R/[520EC6F6](https://pgp.mit.edu/pks/lookup?op=get&search=0xA1ACCAE4520EC6F6) with fingerprint `F4A5FD201B117B1C2AB590E2A1ACCAE4520EC6F6`.<br />
-
-### Misc:
-For more information please visit:
-https://www.qbittorrent.org
-
-or our wiki here:
-http://wiki.qbittorrent.org
-
-Use the forum for troubleshooting before reporting bugs:
-http://forum.qbittorrent.org
-
-Please report any bug (or feature request) to:
-http://bugs.qbittorrent.org
-
-Official IRC channel:
-[#qbittorrent on irc.libera.chat](ircs://irc.libera.chat:6697/qbittorrent)
-
------------------------------------------
-sledgehammer999 \<sledgehammer999@qbittorrent.org\>
-
--- a/apps/qBittorrent/versions/latest/config.json
+++ b/apps/qBittorrent/versions/latest/config.json
@ -1,43 +0,0 @@
-
-{  
-  "formFields": [ 
-    {  
-      "type": "number",
-      "labelZh": "网页端口",  
-      "labelEn": "WebUI Port",  
-      "required": true,  
-      "default": 40155,  
-      "rule": "paramPort",  
-      "envKey": "PANEL_APP_PORT_HTTP",  
-      "edit": true  
-    },
-    {  
-      "type": "number",
-      "labelZh": "BT端口",  
-      "labelEn": "Peer Port",  
-      "required": true,  
-      "default": 40150,  
-      "rule": "paramPort",  
-      "envKey": "PEER_PORT_VALUE",  
-      "edit": true  
-    },
-    {  
-      "type": "text",
-      "labelZh": "缓存文件夹路径",  
-      "labelEn": "Cache folder path",  
-      "required": true,  
-      "default": "./data/.cache",  
-      "envKey": "CACHE_PATH",  
-      "edit": true  
-    },
-    {  
-      "type": "text",
-      "labelZh": "下载文件夹路径",  
-      "labelEn": "Download folder path",  
-      "required": true,  
-      "default": "./data/downloads",  
-      "envKey": "DOWNLOAD_PATH",  
-      "edit": true  
-    }
-  ]  
-}
--- a/apps/qBittorrent/versions/latest/data/.cache/.gitkeep
+++ b/apps/qBittorrent/versions/latest/data/.cache/.gitkeep
--- a/apps/qBittorrent/versions/latest/data/.config/qBittorrent/qBittorrent.conf
+++ b/apps/qBittorrent/versions/latest/data/.config/qBittorrent/qBittorrent.conf
@ -1,75 +0,0 @@
-[General]
-ported_to_new_savepath_system=true
-
-[AutoRun]
-enabled=false
-program=
-
-[Core]
-AutoDeleteAddedTorrentFile=Never
-
-[LegalNotice]
-Accepted=true
-
-[Network]
-Cookies=@Invalid()
-
-[Preferences]
-Advanced\IgnoreLimitsLAN=true
-Advanced\RecheckOnCompletion=false
-Advanced\trackerPort=9000
-Bittorrent\DHT=false
-Bittorrent\LSD=false
-Bittorrent\MaxConnecs=-1
-Bittorrent\MaxConnecsPerTorrent=-1
-Bittorrent\MaxUploads=-1
-Bittorrent\MaxUploadsPerTorrent=-1
-Bittorrent\PeX=false
-Bittorrent\uTP_rate_limited=false
-Connection\PortRangeMin=40150
-Connection\ResolvePeerCountries=true
-Downloads\SavePath=/data/downloads
-Downloads\ScanDirsV2=@Variant(\0\0\0\x1c\0\0\0\0)
-Downloads\StartInPause=true
-DynDNS\DomainName=changeme.dyndns.org
-DynDNS\Enabled=false
-DynDNS\Password=
-DynDNS\Service=0
-DynDNS\Username=
-General\Locale=zh
-MailNotification\email=
-MailNotification\enabled=false
-MailNotification\password=
-MailNotification\req_auth=true
-MailNotification\req_ssl=false
-MailNotification\sender=qBittorrent_notification@example.com
-MailNotification\smtp_server=smtp.changeme.com
-MailNotification\username=
-Queueing\QueueingEnabled=false
-WebUI\Address=*
-WebUI\AlternativeUIEnabled=false
-WebUI\AuthSubnetWhitelist=@Invalid()
-WebUI\AuthSubnetWhitelistEnabled=false
-WebUI\BanDuration=3600
-WebUI\CSRFProtection=false
-WebUI\ClickjackingProtection=true
-WebUI\CustomHTTPHeaders=
-WebUI\CustomHTTPHeadersEnabled=false
-WebUI\Enabled=true
-WebUI\HTTPS\CertificatePath=
-WebUI\HTTPS\Enabled=false
-WebUI\HTTPS\KeyPath=
-WebUI\HostHeaderValidation=true
-WebUI\LocalHostAuth=true
-WebUI\MaxAuthenticationFailCount=5
-WebUI\Port=40155
-WebUI\RootFolder=
-WebUI\SecureCookie=true
-WebUI\ServerDomains=*
-WebUI\SessionTimeout=3600
-WebUI\UseUPnP=true
-WebUI\Username=admin
-
-[RSS]
-AutoDownloader\DownloadRepacks=true
-AutoDownloader\SmartEpisodeFilter=s(\\d+)e(\\d+), (\\d+)x(\\d+), "(\\d{4}[.\\-]\\d{1,2}[.\\-]\\d{1,2})", "(\\d{1,2}[.\\-]\\d{1,2}[.\\-]\\d{4})"
--- a/apps/qBittorrent/versions/latest/data/.local/.gitkeep
+++ b/apps/qBittorrent/versions/latest/data/.local/.gitkeep
--- a/apps/qBittorrent/versions/latest/data/downloads/.gitkeep
+++ b/apps/qBittorrent/versions/latest/data/downloads/.gitkeep
--- a/apps/qBittorrent/versions/latest/docker-compose.yml
+++ b/apps/qBittorrent/versions/latest/docker-compose.yml
@ -1,28 +0,0 @@
-version: "3"
-services:
-  qbittorrent:
-    container_name: ${CONTAINER_NAME}
-    restart: unless-stopped
-    networks:
-      - 1panel-network
-    environment:
-        - UID=1000
-        - GID=1000
-        - PEER_PORT=40150
-        - WEB_PORT=40155
-    ports:
-        - "${PEER_PORT_VALUE}:40150"
-        - "${PEER_PORT_VALUE}:40150/udp"
-        - "${PANEL_APP_PORT_HTTP}:40155"
-    volumes:
-        - "./data/.config:/data/.config"
-        - "./data/.local:/data/.local"
-        - "${CACHE_PATH}:/data/.cache"
-        - "${DOWNLOAD_PATH}:/data/downloads"
-    image: "jarylc/qbittorrent:latest"
-    labels:  
-      createdBy: "Apps"
-   
-networks:  
-  1panel-network:  
-    external: true