From 92b7e49d1004d6ff95fff46b853ba5ed66d155ac Mon Sep 17 00:00:00 2001 From: wanghe-fit2cloud Date: Wed, 3 Apr 2024 10:58:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=9E=E6=BB=9A=20OceanBase=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=87=B3=20v4.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/oceanbase/{4.3.0 => 4.2.1}/data.yml | 31 +++++++------------ .../{4.3.0 => 4.2.1}/docker-compose.yml | 31 +++++++++---------- .../{4.3.0 => 4.2.1}/scripts/init.sh | 0 .../{4.3.0 => 4.2.1}/scripts/uninstall.sh | 0 apps/qbittorrent/README.md | 2 +- 5 files changed, 28 insertions(+), 36 deletions(-) rename apps/oceanbase/{4.3.0 => 4.2.1}/data.yml (69%) rename apps/oceanbase/{4.3.0 => 4.2.1}/docker-compose.yml (68%) rename apps/oceanbase/{4.3.0 => 4.2.1}/scripts/init.sh (100%) rename apps/oceanbase/{4.3.0 => 4.2.1}/scripts/uninstall.sh (100%) diff --git a/apps/oceanbase/4.3.0/data.yml b/apps/oceanbase/4.2.1/data.yml similarity index 69% rename from apps/oceanbase/4.3.0/data.yml rename to apps/oceanbase/4.2.1/data.yml index 871fb649c..601c3e2ca 100644 --- a/apps/oceanbase/4.3.0/data.yml +++ b/apps/oceanbase/4.2.1/data.yml @@ -1,12 +1,5 @@ additionalProperties: formFields: - - default: '' - edit: true - envKey: OB_ROOT_PASSWORD - labelEn: password of sys@root - labelZh: SYS租户密码 - required: false - type: password - default: 2881 edit: true envKey: PANEL_APP_PORT_HTTP @@ -15,25 +8,25 @@ additionalProperties: required: true rule: paramPort type: number - - default: '' - edit: true - envKey: OB_INSTALL_PATH - labelEn: install_path - labelZh: 安装目录 (默认为1panel安装目录，需要最少10G空间) - required: false - type: text - - default: 'test' + - default: 'oceanbase' edit: true envKey: OB_TENANT_NAME - labelEn: tenant_name + labelEn: TENANT NAME labelZh: 租户名 required: true rule: paramCommon type: text + - default: '' + edit: true + envKey: OB_ROOT_PASSWORD + labelEn: Password of sys@root + labelZh: SYS 租户密码 + required: false + type: password - default: 6 edit: true envKey: OB_MEMORY_LIMIT - labelEn: memory_limit + labelEn: MEMORY LIMIT labelZh: 内存 (单位：GB) required: true rule: paramPort @@ -41,7 +34,7 @@ additionalProperties: - default: 5 edit: true envKey: OB_DATAFILE_SIZE - labelEn: datafile_size + labelEn: DATAFILE SIZE labelZh: 数据文件大小 (单位：GB) required: true rule: paramPort @@ -49,7 +42,7 @@ additionalProperties: - default: 5 edit: true envKey: OB_LOG_DISK_SIZE - labelEn: log_disk_size + labelEn: LOG DISK SIZE labelZh: 日志文件大小 (单位：GB) required: true rule: paramPort diff --git a/apps/oceanbase/4.3.0/docker-compose.yml b/apps/oceanbase/4.2.1/docker-compose.yml similarity index 68% rename from apps/oceanbase/4.3.0/docker-compose.yml rename to apps/oceanbase/4.2.1/docker-compose.yml index c2fc25b3e..78a0d74bc 100644 --- a/apps/oceanbase/4.3.0/docker-compose.yml +++ b/apps/oceanbase/4.2.1/docker-compose.yml @@ -1,27 +1,26 @@ version: '3' - -services: - oceanbase: - image: oceanbase/oceanbase-ce:4.3.0 +services: + oceanbase: + image: oceanbase/oceanbase-ce:4.2.1 container_name: ${CONTAINER_NAME} restart: always + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:2881 environment: + MODE: mini + OB_CLUSTER_NAME: ob_1panel OB_MEMORY_LIMIT: ${OB_MEMORY_LIMIT}G OB_DATAFILE_SIZE: ${OB_DATAFILE_SIZE}G OB_LOG_DISK_SIZE: ${OB_LOG_DISK_SIZE}G OB_ROOT_PASSWORD: ${OB_ROOT_PASSWORD} OB_TENANT_NAME: ${OB_TENANT_NAME} - MODE: mini - OB_CLUSTER_NAME: ob_1panel - networks: - - 1panel-network - volumes: - - ${HOME_PATH:-./data/ob}:/root/ob + volumes: + - ./data/ob:/root/ob - ./data/.obd:/root/.obd - ports: - - ${PANEL_APP_PORT_HTTP}:2881 - labels: + labels: createdBy: "Apps" -networks: - 1panel-network: - external: true +networks: + 1panel-network: + external: true \ No newline at end of file diff --git a/apps/oceanbase/4.3.0/scripts/init.sh b/apps/oceanbase/4.2.1/scripts/init.sh similarity index 100% rename from apps/oceanbase/4.3.0/scripts/init.sh rename to apps/oceanbase/4.2.1/scripts/init.sh diff --git a/apps/oceanbase/4.3.0/scripts/uninstall.sh b/apps/oceanbase/4.2.1/scripts/uninstall.sh similarity index 100% rename from apps/oceanbase/4.3.0/scripts/uninstall.sh rename to apps/oceanbase/4.2.1/scripts/uninstall.sh diff --git a/apps/qbittorrent/README.md b/apps/qbittorrent/README.md index b9e74da54..b2db739c6 100644 --- a/apps/qbittorrent/README.md +++ b/apps/qbittorrent/README.md @@ -10,7 +10,7 @@ **qBittorrent** 是一款免费开源的 BitTorrent 客户端程序，用于下载和分享文件通过 BitTorrent 协议。它提供了一个直观的用户界面，支持多平台，包括 Windows、macOS、Linux、FreeBSD 等操作系统。 -### 主要特点： +# 主要特点： - **轻量级**： qBittorrent 软件体积小，资源消耗低，运行稳定。 - **多平台支持**： 用户可以在多个操作系统上使用 qBittorrent，满足不同用户的需求。