From e3f3f8a7dc798222831cb01492afdfa449760e7c Mon Sep 17 00:00:00 2001 From: ms Date: Mon, 10 Nov 2025 10:16:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(umami):=20=E6=B7=BB=E5=8A=A0=20Umami=203.0?= =?UTF-8?q?.0=20=E7=89=88=E6=9C=AC=E6=94=AF=E6=8C=81-=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=20renovate=20=E9=85=8D=E7=BD=AE=E4=BB=A5=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E8=8C=83=E5=9B=B4=20-=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=92=8C=E5=85=A8=E5=B1=80=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E6=96=87=E4=BB=B6=20-=20=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=88=9D=E5=A7=8B=E5=8C=96=E3=80=81=E5=8D=B8=E8=BD=BD?= =?UTF-8?q?=E5=92=8C=E5=8D=87=E7=BA=A7=E8=84=9A=E6=9C=AC=20-=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=8C=81=E4=B9=85=E5=8C=96=E5=92=8C?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=AE=BE=E7=BD=AE=E8=A1=A8=E5=8D=95-=20?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20Docker=20Compose=20=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E9=85=8D=E7=BD=AE-=20=E6=B7=BB=E5=8A=A0=20PostgreSQL=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5=E5=8F=82=E6=95=B0?= =?UTF-8?q?=20-=20=E6=94=AF=E6=8C=81=E5=BA=94=E7=94=A8=E5=AF=86=E9=92=A5?= =?UTF-8?q?=E5=92=8C=E5=9F=BA=E7=A1=80=E8=B7=AF=E5=BE=84=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89-=20=E6=B7=BB=E5=8A=A0=E6=9C=BA=E5=99=A8=E4=BA=BA?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=A6=81=E7=94=A8=E9=80=89=E9=A1=B9=20-=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AE=B9=E5=99=A8=E7=BD=91=E7=BB=9C=E5=92=8C?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E6=98=A0=E5=B0=84-=20=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E6=96=87=E4=BB=B6=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/renovate.json | 4 +- apps/umami/3.0.0/data.yml | 104 ++++++++++++++++++++++++++ apps/umami/3.0.0/docker-compose.yml | 23 ++++++ apps/umami/3.0.0/envs/default.env | 2 + apps/umami/3.0.0/envs/global.env | 2 + apps/umami/3.0.0/scripts/init.sh | 17 +++++ apps/umami/3.0.0/scripts/uninstall.sh | 10 +++ apps/umami/3.0.0/scripts/upgrade.sh | 17 +++++ 8 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 apps/umami/3.0.0/data.yml create mode 100644 apps/umami/3.0.0/docker-compose.yml create mode 100644 apps/umami/3.0.0/envs/default.env create mode 100644 apps/umami/3.0.0/envs/global.env create mode 100644 apps/umami/3.0.0/scripts/init.sh create mode 100644 apps/umami/3.0.0/scripts/uninstall.sh create mode 100644 apps/umami/3.0.0/scripts/upgrade.sh diff --git a/.github/renovate.json b/.github/renovate.json index ca30b6e93..83eb19cc5 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -265,9 +265,9 @@ }, { "matchFileNames": [ - "apps/umami*/2.16.1/*.yml" + "apps/umami*/2.19.0/*.yml" ], - "allowedVersions": ">=2.16.1" + "allowedVersions": "<3.0.0" }, { "matchDatasources": [ diff --git a/apps/umami/3.0.0/data.yml b/apps/umami/3.0.0/data.yml new file mode 100644 index 000000000..e93c2b180 --- /dev/null +++ b/apps/umami/3.0.0/data.yml @@ -0,0 +1,104 @@ +additionalProperties: + formFields: + - child: + default: "" + envKey: PANEL_POSTGRES_SERVICE + required: true + type: service + default: postgresql + envKey: PANEL_POSTGRES_TYPE + labelZh: Postgres 服务 (前置检查) + labelEn: Postgres Service (Pre-check) + required: true + type: apps + values: + - label: PostgreSQL + value: postgresql + - default: "/home/umami" + edit: true + envKey: UMAMI_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 3000 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: 连接端口 + labelEn: Connection Port + required: true + rule: paramPort + type: number + - default: "" + edit: true + envKey: APP_SECRET + labelZh: 应用密钥 + labelEn: Application Secret + random: true + required: false + rule: paramComplexity + type: password + - default: "/" + edit: true + envKey: BASE_PATH + labelZh: 基础路径 + labelEn: Base Path + required: true + type: text + - default: "" + edit: true + envKey: ALLOWED_FRAME_URLS + labelZh: 允许的 frame 地址 + labelEn: Allowed frame urls + required: false + type: text + - default: "0" + edit: true + envKey: DISABLE_BOT_CHECK + labelZh: 禁用机器人检测 + labelEn: Disable bot detection + required: true + type: select + values: + - label: 开启 + value: "1" + - label: 关闭 + value: "0" + - default: "127.0.0.1" + edit: true + envKey: DB_HOSTNAME + labelZh: 数据库 主机地址 + labelEn: Database Host + required: true + type: text + - default: 5432 + edit: true + envKey: DB_PORT + labelZh: 数据库 端口 + labelEn: Database Port + required: true + rule: paramPort + type: number + - default: "umami" + edit: true + envKey: DB_USERNAME + labelZh: 数据库 用户名 + labelEn: Database User + required: true + type: text + - default: "" + edit: true + envKey: DB_PASSWORD + labelEn: Database Password + labelZh: 数据库 密码 + random: true + required: true + rule: paramComplexity + type: password + - default: "umami" + edit: true + envKey: DB_DATABASE_NAME + labelZh: 数据库 名称 + labelEn: Database Name + required: true + type: text diff --git a/apps/umami/3.0.0/docker-compose.yml b/apps/umami/3.0.0/docker-compose.yml new file mode 100644 index 000000000..6d3a5440f --- /dev/null +++ b/apps/umami/3.0.0/docker-compose.yml @@ -0,0 +1,23 @@ +networks: + 1panel-network: + external: true + +services: + umami: + image: umamisoftware/umami:3.0.0 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:3000 + env_file: + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${ENV_FILE:-/etc/1panel/envs/default.env} + environment: + - DISABLE_TELEMETRY=1 + - REMOVE_TRAILING_SLASH=1 + - DATABASE_TYPE=postgresql + - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} diff --git a/apps/umami/3.0.0/envs/default.env b/apps/umami/3.0.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/umami/3.0.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/umami/3.0.0/envs/global.env b/apps/umami/3.0.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/umami/3.0.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/umami/3.0.0/scripts/init.sh b/apps/umami/3.0.0/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/umami/3.0.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/umami/3.0.0/scripts/uninstall.sh b/apps/umami/3.0.0/scripts/uninstall.sh new file mode 100644 index 000000000..c86c4fbca --- /dev/null +++ b/apps/umami/3.0.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/umami/3.0.0/scripts/upgrade.sh b/apps/umami/3.0.0/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/umami/3.0.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