From c94d885b81f2992161dc11f07c391ce9963e8b97 Mon Sep 17 00:00:00 2001 From: okxlin <61420215+okxlin@users.noreply.github.com> Date: Tue, 16 May 2023 17:47:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96flarum=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E8=AE=BF=E9=97=AE;=E6=9B=B4=E6=96=B0alist3.17.0;=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E5=8C=96;=20(#90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * '添加qBittorrent,jellyfin,ALS,alist,watchtower' * 添加flarum到应用商店 * 添加flarum到list * 更新flarum的一些说明 * 更新flarum logo * 添加重启参数 * 规范化 * 修正qBittorrent * 移除无用项 * 修正错误 * 修正细节 * 规范化 --- alist/versions/{3.16.3 => 3.17.0}/README.md | 0 alist/versions/{3.16.3 => 3.17.0}/config.json | 0 alist/versions/{3.16.3 => 3.17.0}/data/data/.gitkeep | 0 alist/versions/{3.16.3 => 3.17.0}/data/mnt/.gitkeep | 0 alist/versions/{3.16.3 => 3.17.0}/docker-compose.yml | 4 ++-- flarum/versions/1.7.1/config.json | 8 ++++---- flarum/versions/1.7.1/docker-compose.yml | 4 ++-- jellyfin/versions/10.8.9/docker-compose.yml | 2 +- list.json | 4 ++-- qBittorrent/versions/4.3.5/docker-compose.yml | 2 +- qBittorrent/versions/4.5.2/docker-compose.yml | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) rename alist/versions/{3.16.3 => 3.17.0}/README.md (100%) rename alist/versions/{3.16.3 => 3.17.0}/config.json (100%) rename alist/versions/{3.16.3 => 3.17.0}/data/data/.gitkeep (100%) rename alist/versions/{3.16.3 => 3.17.0}/data/mnt/.gitkeep (100%) rename alist/versions/{3.16.3 => 3.17.0}/docker-compose.yml (87%) diff --git a/alist/versions/3.16.3/README.md b/alist/versions/3.17.0/README.md similarity index 100% rename from alist/versions/3.16.3/README.md rename to alist/versions/3.17.0/README.md diff --git a/alist/versions/3.16.3/config.json b/alist/versions/3.17.0/config.json similarity index 100% rename from alist/versions/3.16.3/config.json rename to alist/versions/3.17.0/config.json diff --git a/alist/versions/3.16.3/data/data/.gitkeep b/alist/versions/3.17.0/data/data/.gitkeep similarity index 100% rename from alist/versions/3.16.3/data/data/.gitkeep rename to alist/versions/3.17.0/data/data/.gitkeep diff --git a/alist/versions/3.16.3/data/mnt/.gitkeep b/alist/versions/3.17.0/data/mnt/.gitkeep similarity index 100% rename from alist/versions/3.16.3/data/mnt/.gitkeep rename to alist/versions/3.17.0/data/mnt/.gitkeep diff --git a/alist/versions/3.16.3/docker-compose.yml b/alist/versions/3.17.0/docker-compose.yml similarity index 87% rename from alist/versions/3.16.3/docker-compose.yml rename to alist/versions/3.17.0/docker-compose.yml index 1b137c1b9..928e36072 100644 --- a/alist/versions/3.16.3/docker-compose.yml +++ b/alist/versions/3.17.0/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: alist: container_name: ${CONTAINER_NAME} - restart: unless-stopped + restart: always networks: - 1panel-network ports: @@ -14,7 +14,7 @@ services: - PUID=0 - PGID=0 - UMASK=022 - image: xhofe/alist:v3.16.3 + image: xhofe/alist:v3.17.0 labels: createdBy: "Apps" diff --git a/flarum/versions/1.7.1/config.json b/flarum/versions/1.7.1/config.json index b012984af..00bb18d01 100644 --- a/flarum/versions/1.7.1/config.json +++ b/flarum/versions/1.7.1/config.json @@ -92,11 +92,11 @@ }, { "type": "text", - "labelZh": "本机IP", - "labelEn": "Local IP", + "labelZh": "外部访问地址", + "labelEn": "External URL", "required": true, - "default": "127.0.0.1", - "envKey": "Dockerized_HOST", + "default": "http://localhost:40020", + "envKey": "FLARUM_EXTERNAL_URL", "edit": true } ] diff --git a/flarum/versions/1.7.1/docker-compose.yml b/flarum/versions/1.7.1/docker-compose.yml index 8c0ce89d3..527e1c01f 100644 --- a/flarum/versions/1.7.1/docker-compose.yml +++ b/flarum/versions/1.7.1/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: flarum: container_name: ${CONTAINER_NAME} - restart: unless-stopped + restart: always networks: - 1panel-network ports: @@ -27,7 +27,7 @@ services: - DB_PREFIX=${PANEL_DB_PREFIX} - DB_NOPREFIX=false - DB_TIMEOUT=60 - - FLARUM_BASE_URL=http://${Dockerized_HOST}:${PANEL_APP_PORT_HTTP} + - FLARUM_BASE_URL=${FLARUM_EXTERNAL_URL} image: crazymax/flarum:1.7.1 labels: createdBy: Apps diff --git a/jellyfin/versions/10.8.9/docker-compose.yml b/jellyfin/versions/10.8.9/docker-compose.yml index 87083470b..67feb39e1 100644 --- a/jellyfin/versions/10.8.9/docker-compose.yml +++ b/jellyfin/versions/10.8.9/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: jellyfin: container_name: ${CONTAINER_NAME} - restart: unless-stopped + restart: always networks: - 1panel-network ports: diff --git a/list.json b/list.json index 21f0184bf..b70dbd651 100644 --- a/list.json +++ b/list.json @@ -379,7 +379,7 @@ "key": "alist", "name": "alist", "tags": ["Tool"], - "versions": ["3.16.3"], + "versions": ["3.17.0"], "shortDescZh": "一个支持多存储的文件列表程序", "shortDescEn": "A file list program that supports multiple storage", "type": "tool", @@ -460,4 +460,4 @@ "document": "https://ehang-io.github.io/nps" } ] -} +} \ No newline at end of file diff --git a/qBittorrent/versions/4.3.5/docker-compose.yml b/qBittorrent/versions/4.3.5/docker-compose.yml index 4a11bc5bc..1b25e2201 100644 --- a/qBittorrent/versions/4.3.5/docker-compose.yml +++ b/qBittorrent/versions/4.3.5/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: qbittorrent: container_name: ${CONTAINER_NAME} - restart: unless-stopped + restart: always networks: - 1panel-network environment: diff --git a/qBittorrent/versions/4.5.2/docker-compose.yml b/qBittorrent/versions/4.5.2/docker-compose.yml index 018a1079a..793143330 100644 --- a/qBittorrent/versions/4.5.2/docker-compose.yml +++ b/qBittorrent/versions/4.5.2/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: qbittorrent: container_name: ${CONTAINER_NAME} - restart: unless-stopped + restart: always networks: - 1panel-network environment: