Merge remote-tracking branch 'origin/custom' into custom

appstore/umami-mysql/2.16.0/.env

@@ -0,0 +1,36 @@
+# MySQL 服务 (前置检查) [必填] 
+PANEL_DB_TYPE=mysql
+
+# 数据持久化路径 [必填] 
+UMAMI_ROOT_PATH=/home/umami
+
+# 连接端口 [必填] 
+PANEL_APP_PORT_HTTP=3000
+
+# 应用密钥 
+APP_SECRET=
+
+# 基础路径 [必填] 
+BASE_PATH=/
+
+# 允许的 frame 地址 
+ALLOWED_FRAME_URLS=
+
+# 禁用机器人检测 [必填] 
+DISABLE_BOT_CHECK=0
+
+# 数据库 主机地址 [必填] 
+DB_HOSTNAME=127.0.0.1
+
+# 数据库 端口 [必填] 
+DB_PORT=3306
+
+# 数据库 用户名 [必填] 
+DB_USERNAME=umami
+
+# 数据库 密码 [必填] 
+DB_PASSWORD=
+
+# 数据库 名称 [必填] 
+DB_DATABASE_NAME=umami
+

appstore/umami-mysql/2.16.0/data.yml

@@ -0,0 +1,109 @@
+additionalProperties:
+  formFields:
+    - child:
+        default: ""
+        envKey: PANEL_DB_HOST
+        required: true
+        type: service
+      default: mysql
+      edit: true
+      envKey: PANEL_DB_TYPE
+      labelZh: MySQL 服务 (前置检查)
+      labelEn: Database Service (Pre-check)
+      required: true
+      type: apps
+      values:
+        - label: MySQL
+          value: mysql
+        - label: MariaDB
+          value: mariadb
+        - label: Percona
+          value: percona
+    - 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: 3306
+      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

appstore/umami-mysql/2.16.0/docker-compose.yml

@@ -0,0 +1,23 @@
+networks:
+  1panel-network:
+    external: true
+services:
+  umami-mysql:
+    container_name: umami-mysql
+    env_file:
+    - ./envs/global.env
+    - .env
+    environment:
+    - DISABLE_TELEMETRY = 1
+    - REMOVE_TRAILING_SLASH = 1
+    - DATABASE_TYPE=mysql
+    - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME}
+    image: umamisoftware/umami:mysql-v2.16.0
+    labels:
+      createdBy: Apps
+    networks:
+    - 1panel-network
+    ports:
+    - ${PANEL_APP_PORT_HTTP}:3000
+    restart: always
+version: '3.8'

appstore/umami-mysql/2.16.0/envs/default.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+ENV_FILE=.env

appstore/umami-mysql/2.16.0/envs/global.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+TZ=Asia/Shanghai

appstore/umami-mysql/2.16.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

appstore/umami-mysql/2.16.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

appstore/umami-mysql/2.16.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

appstore/umami/2.16.0/.env

@@ -0,0 +1,36 @@
+# Postgres 服务 (前置检查) [必填] 
+PANEL_POSTGRES_TYPE=postgresql
+
+# 数据持久化路径 [必填] 
+UMAMI_ROOT_PATH=/home/umami
+
+# 连接端口 [必填] 
+PANEL_APP_PORT_HTTP=3000
+
+# 应用密钥 
+APP_SECRET=
+
+# 基础路径 [必填] 
+BASE_PATH=/
+
+# 允许的 frame 地址 
+ALLOWED_FRAME_URLS=
+
+# 禁用机器人检测 [必填] 
+DISABLE_BOT_CHECK=0
+
+# 数据库 主机地址 [必填] 
+DB_HOSTNAME=127.0.0.1
+
+# 数据库 端口 [必填] 
+DB_PORT=5432
+
+# 数据库 用户名 [必填] 
+DB_USERNAME=umami
+
+# 数据库 密码 [必填] 
+DB_PASSWORD=
+
+# 数据库 名称 [必填] 
+DB_DATABASE_NAME=umami
+

appstore/umami/2.16.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

appstore/umami/2.16.0/docker-compose.yml

@@ -0,0 +1,22 @@
+networks:
+  1panel-network:
+    external: true
+services:
+  umami:
+    container_name: umami
+    env_file:
+    - ./envs/global.env
+    - .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}
+    image: umamisoftware/umami:postgresql-v2.16.0
+    labels:
+      createdBy: Apps
+    networks:
+    - 1panel-network
+    ports:
+    - ${PANEL_APP_PORT_HTTP}:3000
+    restart: always

appstore/umami/2.16.0/envs/default.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+ENV_FILE=.env

appstore/umami/2.16.0/envs/global.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+TZ=Asia/Shanghai

appstore/umami/2.16.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

appstore/umami/2.16.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

appstore/umami/2.16.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

dockge/umami-mysql/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     - REMOVE_TRAILING_SLASH = 1
     - DATABASE_TYPE=mysql
     - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME}
-    image: umamisoftware/umami:mysql-v2.16.1
+    image: umamisoftware/umami:mysql-v2.16.0
     labels:
       createdBy: Apps
     networks:

dockge/umami-mysql_2_16_1/.env

@@ -0,0 +1,36 @@
+# MySQL 服务 (前置检查) [必填] 
+PANEL_DB_TYPE=mysql
+
+# 数据持久化路径 [必填] 
+UMAMI_ROOT_PATH=/home/umami
+
+# 连接端口 [必填] 
+PANEL_APP_PORT_HTTP=3000
+
+# 应用密钥 
+APP_SECRET=
+
+# 基础路径 [必填] 
+BASE_PATH=/
+
+# 允许的 frame 地址 
+ALLOWED_FRAME_URLS=
+
+# 禁用机器人检测 [必填] 
+DISABLE_BOT_CHECK=0
+
+# 数据库 主机地址 [必填] 
+DB_HOSTNAME=127.0.0.1
+
+# 数据库 端口 [必填] 
+DB_PORT=3306
+
+# 数据库 用户名 [必填] 
+DB_USERNAME=umami
+
+# 数据库 密码 [必填] 
+DB_PASSWORD=
+
+# 数据库 名称 [必填] 
+DB_DATABASE_NAME=umami
+

dockge/umami-mysql_2_16_1/docker-compose.yml

@@ -0,0 +1,23 @@
+networks:
+  1panel-network:
+    external: true
+services:
+  umami-mysql:
+    container_name: umami-mysql
+    env_file:
+    - ./envs/global.env
+    - .env
+    environment:
+    - DISABLE_TELEMETRY = 1
+    - REMOVE_TRAILING_SLASH = 1
+    - DATABASE_TYPE=mysql
+    - DATABASE_URL=mysql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME}
+    image: umamisoftware/umami:mysql-v2.16.1
+    labels:
+      createdBy: Apps
+    networks:
+    - 1panel-network
+    ports:
+    - ${PANEL_APP_PORT_HTTP}:3000
+    restart: always
+version: '3.8'

dockge/umami-mysql_2_16_1/envs/default.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+ENV_FILE=.env

dockge/umami-mysql_2_16_1/envs/global.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+TZ=Asia/Shanghai

dockge/umami/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     - REMOVE_TRAILING_SLASH = 1
     - DATABASE_TYPE=postgresql
     - DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME}
-    image: umamisoftware/umami:postgresql-v2.16.1
+    image: umamisoftware/umami:postgresql-v2.16.0
     labels:
       createdBy: Apps
     networks:

dockge/umami_2_16_1/.env

@@ -0,0 +1,36 @@
+# Postgres 服务 (前置检查) [必填] 
+PANEL_POSTGRES_TYPE=postgresql
+
+# 数据持久化路径 [必填] 
+UMAMI_ROOT_PATH=/home/umami
+
+# 连接端口 [必填] 
+PANEL_APP_PORT_HTTP=3000
+
+# 应用密钥 
+APP_SECRET=
+
+# 基础路径 [必填] 
+BASE_PATH=/
+
+# 允许的 frame 地址 
+ALLOWED_FRAME_URLS=
+
+# 禁用机器人检测 [必填] 
+DISABLE_BOT_CHECK=0
+
+# 数据库 主机地址 [必填] 
+DB_HOSTNAME=127.0.0.1
+
+# 数据库 端口 [必填] 
+DB_PORT=5432
+
+# 数据库 用户名 [必填] 
+DB_USERNAME=umami
+
+# 数据库 密码 [必填] 
+DB_PASSWORD=
+
+# 数据库 名称 [必填] 
+DB_DATABASE_NAME=umami
+

dockge/umami_2_16_1/docker-compose.yml

@@ -0,0 +1,22 @@
+networks:
+  1panel-network:
+    external: true
+services:
+  umami:
+    container_name: umami
+    env_file:
+    - ./envs/global.env
+    - .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}
+    image: umamisoftware/umami:postgresql-v2.16.1
+    labels:
+      createdBy: Apps
+    networks:
+    - 1panel-network
+    ports:
+    - ${PANEL_APP_PORT_HTTP}:3000
+    restart: always

dockge/umami_2_16_1/envs/default.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+ENV_FILE=.env

dockge/umami_2_16_1/envs/global.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+TZ=Asia/Shanghai