From 8fcb38719f08b5503bdb5a6d7b688fd67b4368fb Mon Sep 17 00:00:00 2001 From: okxlin Date: Thu, 7 Sep 2023 23:37:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/1panel/README.md | 2 +- apps/safeline/3.3.0/.env.sample | 2 +- apps/safeline/3.3.0/data.yml | 2 +- apps/safeline/3.3.0/docker-compose.yml | 2 +- apps/safeline/latest/.env.sample | 2 +- apps/safeline/latest/data.yml | 2 +- apps/safeline/latest/docker-compose.yml | 2 +- apps/safeline/newnet-3.3.0/.env.sample | 2 +- apps/safeline/newnet-3.3.0/data.yml | 2 +- apps/safeline/newnet-3.3.0/docker-compose.yml | 2 +- apps/safeline/newnet-latest/.env.sample | 2 +- apps/safeline/newnet-latest/data.yml | 2 +- apps/safeline/newnet-latest/docker-compose.yml | 2 +- apps/seafile/data.yml | 2 +- apps/seatable/data.yml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/1panel/README.md b/apps/1panel/README.md index e84d7750..2102692f 100644 --- a/apps/1panel/README.md +++ b/apps/1panel/README.md @@ -14,12 +14,12 @@ *** - 不可调整参数 - `/var/run/docker.sock`的相关映射 - - `/var/lib/docker/volumes:/var/lib/docker/volumes` 存储卷映射 *** - 可调整参数 - `/www/data/1panel-data:/opt` 文件存储映射 - `TZ=Asia/Shanghai` 时区设置 - `1panel` 容器名 + - `/var/lib/docker/volumes:/var/lib/docker/volumes` 存储卷映射 *** **架构平台对应镜像** - amd64 diff --git a/apps/safeline/3.3.0/.env.sample b/apps/safeline/3.3.0/.env.sample index e6562adb..c253fa54 100644 --- a/apps/safeline/3.3.0/.env.sample +++ b/apps/safeline/3.3.0/.env.sample @@ -3,7 +3,7 @@ PANEL_APP_PORT_HTTP="40080" PANEL_APP_PORT_HTTP2="40081" POSTGRES_PASSWORD="password_xxJdZD" REDIS_HOST="redis" -REDIS_PASSWORD="" +PANEL_REDIS_ROOT_PASSWORD="" REDIS_PORT="6379" SAFELINE_DIR="./data" SUBNET_PREFIX="169.254.0" diff --git a/apps/safeline/3.3.0/data.yml b/apps/safeline/3.3.0/data.yml index 0947b6be..39e01582 100644 --- a/apps/safeline/3.3.0/data.yml +++ b/apps/safeline/3.3.0/data.yml @@ -18,7 +18,7 @@ additionalProperties: type: number - default: "" edit: true - envKey: REDIS_PASSWORD + envKey: PANEL_REDIS_ROOT_PASSWORD labelEn: Redis Service Password labelZh: Redis服务密码 required: true diff --git a/apps/safeline/3.3.0/docker-compose.yml b/apps/safeline/3.3.0/docker-compose.yml index 41be2078..eab2527f 100644 --- a/apps/safeline/3.3.0/docker-compose.yml +++ b/apps/safeline/3.3.0/docker-compose.yml @@ -80,7 +80,7 @@ services: - LOG_DIR=/logs/mario - GOGC=100 - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - - REDIS_URL=redis://:${REDIS_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0 + - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/2 cap_drop: - net_raw labels: diff --git a/apps/safeline/latest/.env.sample b/apps/safeline/latest/.env.sample index e6562adb..c253fa54 100644 --- a/apps/safeline/latest/.env.sample +++ b/apps/safeline/latest/.env.sample @@ -3,7 +3,7 @@ PANEL_APP_PORT_HTTP="40080" PANEL_APP_PORT_HTTP2="40081" POSTGRES_PASSWORD="password_xxJdZD" REDIS_HOST="redis" -REDIS_PASSWORD="" +PANEL_REDIS_ROOT_PASSWORD="" REDIS_PORT="6379" SAFELINE_DIR="./data" SUBNET_PREFIX="169.254.0" diff --git a/apps/safeline/latest/data.yml b/apps/safeline/latest/data.yml index 0947b6be..39e01582 100644 --- a/apps/safeline/latest/data.yml +++ b/apps/safeline/latest/data.yml @@ -18,7 +18,7 @@ additionalProperties: type: number - default: "" edit: true - envKey: REDIS_PASSWORD + envKey: PANEL_REDIS_ROOT_PASSWORD labelEn: Redis Service Password labelZh: Redis服务密码 required: true diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml index a31b20e5..7a4f8311 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/apps/safeline/latest/docker-compose.yml @@ -80,7 +80,7 @@ services: - LOG_DIR=/logs/mario - GOGC=100 - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - - REDIS_URL=redis://:${REDIS_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0 + - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/2 cap_drop: - net_raw labels: diff --git a/apps/safeline/newnet-3.3.0/.env.sample b/apps/safeline/newnet-3.3.0/.env.sample index 96bfbffa..d55063b4 100644 --- a/apps/safeline/newnet-3.3.0/.env.sample +++ b/apps/safeline/newnet-3.3.0/.env.sample @@ -3,7 +3,7 @@ PANEL_APP_PORT_HTTP="40080" PANEL_APP_PORT_HTTP2="40081" POSTGRES_PASSWORD="password_xxJdZD" REDIS_HOST="redis" -REDIS_PASSWORD="" +PANEL_REDIS_ROOT_PASSWORD="" REDIS_PORT="6379" SAFELINE_DIR="./data" SUBNET_PREFIX="169.254.0" \ No newline at end of file diff --git a/apps/safeline/newnet-3.3.0/data.yml b/apps/safeline/newnet-3.3.0/data.yml index 11e1b387..0e9ad796 100644 --- a/apps/safeline/newnet-3.3.0/data.yml +++ b/apps/safeline/newnet-3.3.0/data.yml @@ -18,7 +18,7 @@ additionalProperties: type: number - default: "" edit: true - envKey: REDIS_PASSWORD + envKey: PANEL_REDIS_ROOT_PASSWORD labelEn: Redis Service Password labelZh: Redis服务密码 required: true diff --git a/apps/safeline/newnet-3.3.0/docker-compose.yml b/apps/safeline/newnet-3.3.0/docker-compose.yml index 6cfd926a..b3b1856a 100644 --- a/apps/safeline/newnet-3.3.0/docker-compose.yml +++ b/apps/safeline/newnet-3.3.0/docker-compose.yml @@ -82,7 +82,7 @@ services: - LOG_DIR=/logs/mario - GOGC=100 - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - - REDIS_URL=redis://:${REDIS_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0 + - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/2 cap_drop: - net_raw labels: diff --git a/apps/safeline/newnet-latest/.env.sample b/apps/safeline/newnet-latest/.env.sample index 96bfbffa..d55063b4 100644 --- a/apps/safeline/newnet-latest/.env.sample +++ b/apps/safeline/newnet-latest/.env.sample @@ -3,7 +3,7 @@ PANEL_APP_PORT_HTTP="40080" PANEL_APP_PORT_HTTP2="40081" POSTGRES_PASSWORD="password_xxJdZD" REDIS_HOST="redis" -REDIS_PASSWORD="" +PANEL_REDIS_ROOT_PASSWORD="" REDIS_PORT="6379" SAFELINE_DIR="./data" SUBNET_PREFIX="169.254.0" \ No newline at end of file diff --git a/apps/safeline/newnet-latest/data.yml b/apps/safeline/newnet-latest/data.yml index 11e1b387..0e9ad796 100644 --- a/apps/safeline/newnet-latest/data.yml +++ b/apps/safeline/newnet-latest/data.yml @@ -18,7 +18,7 @@ additionalProperties: type: number - default: "" edit: true - envKey: REDIS_PASSWORD + envKey: PANEL_REDIS_ROOT_PASSWORD labelEn: Redis Service Password labelZh: Redis服务密码 required: true diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml index 16a88382..0fe2c49a 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/apps/safeline/newnet-latest/docker-compose.yml @@ -82,7 +82,7 @@ services: - LOG_DIR=/logs/mario - GOGC=100 - DATABASE_URL=postgres://safeline-ce:${POSTGRES_PASSWORD}@safeline-postgres/safeline-ce - - REDIS_URL=redis://:${REDIS_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/0 + - REDIS_URL=redis://:${PANEL_REDIS_ROOT_PASSWORD}@${REDIS_HOST}:${REDIS_PORT}/2 cap_drop: - net_raw labels: diff --git a/apps/seafile/data.yml b/apps/seafile/data.yml index a79efdc3..87a359fb 100644 --- a/apps/seafile/data.yml +++ b/apps/seafile/data.yml @@ -13,7 +13,7 @@ additionalProperties: shortDescEn: An open source cloud storage system with privacy protection and teamwork features type: tool crossVersionUpdate: true - limit: 0 + limit: 1 recommend: 0 website: https://www.seafile.com github: https://github.com/haiwen/seafile diff --git a/apps/seatable/data.yml b/apps/seatable/data.yml index 40ca98fc..c82f18c7 100644 --- a/apps/seatable/data.yml +++ b/apps/seatable/data.yml @@ -13,7 +13,7 @@ additionalProperties: shortDescEn: A spreadsheet/database like Airtable type: tool crossVersionUpdate: true - limit: 0 + limit: 1 recommend: 0 website: https://seatable.cn github: https://github.com/seatable/seatable