From 0f244bd734731316a59c20672ece4466456aa6e5 Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Fri, 15 Aug 2025 13:55:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E5=AE=9D=E5=A1=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Meng Sen --- .github/renovate.json | 6 +++ apps/baota/10.0/data.yml | 62 ++++------------------------- apps/baota/10.0/docker-compose.yml | 13 +++--- apps/baota/9.0/data.yml | 33 +++++++++++++++ apps/baota/9.0/docker-compose.yml | 28 +++++++++++++ apps/baota/9.0/envs/default.env | 2 + apps/baota/9.0/envs/global.env | 2 + apps/baota/9.0/scripts/init.sh | 17 ++++++++ apps/baota/9.0/scripts/uninstall.sh | 10 +++++ apps/baota/9.0/scripts/upgrade.sh | 17 ++++++++ 10 files changed, 129 insertions(+), 61 deletions(-) create mode 100644 apps/baota/9.0/data.yml create mode 100644 apps/baota/9.0/docker-compose.yml create mode 100644 apps/baota/9.0/envs/default.env create mode 100644 apps/baota/9.0/envs/global.env create mode 100644 apps/baota/9.0/scripts/init.sh create mode 100644 apps/baota/9.0/scripts/uninstall.sh create mode 100644 apps/baota/9.0/scripts/upgrade.sh diff --git a/.github/renovate.json b/.github/renovate.json index bc4aebb90..8277262dc 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -115,6 +115,12 @@ ], "allowedVersions": "/^4.*.*/" }, + { + "matchFileNames": [ + "apps/baota/9.*/*.yml" + ], + "allowedVersions": "/^9.*/" + }, { "matchFileNames": [ "apps/emby/4.8.*/*.yml" diff --git a/apps/baota/10.0/data.yml b/apps/baota/10.0/data.yml index 4d13b5b69..08bd5e9f3 100644 --- a/apps/baota/10.0/data.yml +++ b/apps/baota/10.0/data.yml @@ -1,12 +1,5 @@ additionalProperties: formFields: - - default: "/home/baota" - edit: true - envKey: BAOTA_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - default: "host" edit: true envKey: NETWORK_MODE @@ -23,6 +16,13 @@ additionalProperties: value: "none" - label: 1panel-network value: "1panel-network" + - default: "/home/baota" + edit: true + envKey: BAOTA_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text - default: 8888 edit: true envKey: PANEL_APP_PORT_HTTP @@ -31,51 +31,3 @@ additionalProperties: required: true rule: paramPort type: number - - default: 80 - edit: true - envKey: PANEL_APP_PORT_WEB_HTTP - labelZh: 网站服务 HTTP - labelEn: Website service HTTP - required: true - rule: paramPort - type: number - - default: 443 - edit: true - envKey: PANEL_APP_PORT_WEB_HTTPS - labelZh: 网站服务 HTTPS - labelEn: Website service HTTPS - required: true - rule: paramPort - type: number - - default: 22 - edit: true - envKey: PANEL_APP_PORT_SSH - labelZh: SSH 端口 - labelEn: SSH port - required: true - rule: paramPort - type: number - - default: 21 - edit: true - envKey: PANEL_APP_PORT_FTP - labelZh: FTP 端口 - labelEn: FTP port - required: true - rule: paramPort - type: number - - default: 3306 - edit: true - envKey: PANEL_APP_PORT_MYSQL - labelZh: MySQL 端口 - labelEn: MySQL port - required: true - rule: paramPort - type: number - - default: 888 - edit: true - envKey: PANEL_APP_PORT_PHPADMIN - labelZh: phpMyAdmin 端口 - labelEn: phpMyAdmin port - required: true - rule: paramPort - type: number diff --git a/apps/baota/10.0/docker-compose.yml b/apps/baota/10.0/docker-compose.yml index 1fe65a17f..60130d5bb 100644 --- a/apps/baota/10.0/docker-compose.yml +++ b/apps/baota/10.0/docker-compose.yml @@ -12,12 +12,13 @@ services: network_mode: ${NETWORK_MODE} ports: - ${PANEL_APP_PORT_HTTP}:8888 - - ${PANEL_APP_PORT_WEB_HTTP}:80 - - ${PANEL_APP_PORT_WEB_HTTPS}:443 - - ${PANEL_APP_PORT_FTP}:21 - - ${PANEL_APP_PORT_SSH}:22 - - ${PANEL_APP_PORT_MYSQL}:3306 - - ${PANEL_APP_PORT_PHPADMIN}:888 + expose: + - 888 + - 22 + - 21 + - 3306 + - 80 + - 443 env_file: - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} diff --git a/apps/baota/9.0/data.yml b/apps/baota/9.0/data.yml new file mode 100644 index 000000000..08bd5e9f3 --- /dev/null +++ b/apps/baota/9.0/data.yml @@ -0,0 +1,33 @@ +additionalProperties: + formFields: + - default: "host" + edit: true + envKey: NETWORK_MODE + labelEn: Drive path + labelZh: 网络模式 + required: true + type: select + values: + - label: 主机网络模式 + value: "host" + - label: 桥接网络模式 + value: "bridge" + - label: 无网络模式 + value: "none" + - label: 1panel-network + value: "1panel-network" + - default: "/home/baota" + edit: true + envKey: BAOTA_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 8888 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number diff --git a/apps/baota/9.0/docker-compose.yml b/apps/baota/9.0/docker-compose.yml new file mode 100644 index 000000000..85c8d9f86 --- /dev/null +++ b/apps/baota/9.0/docker-compose.yml @@ -0,0 +1,28 @@ +networks: + 1panel-network: + external: true + +services: + baota: + image: btpanel/baota:9.0_lts_latest + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + network_mode: ${NETWORK_MODE} + ports: + - ${PANEL_APP_PORT_HTTP}:8888 + expose: + - 888 + - 22 + - 21 + - 3306 + - 80 + - 443 + env_file: + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${ENV_FILE:-/etc/1panel/envs/default.env} + volumes: + - ${BAOTA_ROOT_PATH}/wwwroot:/www/wwwroot + - ${BAOTA_ROOT_PATH}/data:/www/server/data + - ${BAOTA_ROOT_PATH}/vhost:/www/server/panel/vhost diff --git a/apps/baota/9.0/envs/default.env b/apps/baota/9.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/baota/9.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/baota/9.0/envs/global.env b/apps/baota/9.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/baota/9.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/baota/9.0/scripts/init.sh b/apps/baota/9.0/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/baota/9.0/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/baota/9.0/scripts/uninstall.sh b/apps/baota/9.0/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/apps/baota/9.0/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/baota/9.0/scripts/upgrade.sh b/apps/baota/9.0/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/baota/9.0/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