From c161f5855074cfd142fe5f7d00542649346a5bf1 Mon Sep 17 00:00:00 2001
From: wanghe-fit2cloud <wanghe@fit2cloud.com>
Date: Mon, 22 Jan 2024 14:32:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20Umami=20=E6=94=AF=E6=8C=81=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=20PostgreSQL=20=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/umami/{2.4.1 => 2.8.0}/data.yml           | 17 +++++++++++++----
 apps/umami/{2.4.1 => 2.8.0}/docker-compose.yml |  6 +++---
 2 files changed, 16 insertions(+), 7 deletions(-)
 rename apps/umami/{2.4.1 => 2.8.0}/data.yml (77%)
 rename apps/umami/{2.4.1 => 2.8.0}/docker-compose.yml (56%)

diff --git a/apps/umami/2.4.1/data.yml b/apps/umami/2.8.0/data.yml
similarity index 77%
rename from apps/umami/2.4.1/data.yml
rename to apps/umami/2.8.0/data.yml
index 65267a7ca..6dcac541f 100644
--- a/apps/umami/2.4.1/data.yml
+++ b/apps/umami/2.8.0/data.yml
@@ -1,12 +1,21 @@
 additionalProperties:
     formFields:
-        - default: ""
-          envKey: PANEL_DB_HOST
-          key: mysql
+        - child:
+            default: ""
+            envKey: PANEL_DB_HOST
+            required: true
+            type: service
+          default: mysql
+          envKey: PANEL_DB_TYPE
           labelEn: Database Service
           labelZh: 数据库服务
           required: true
-          type: service
+          type: apps
+          values:
+            - label: MySQL
+              value: mysql
+            - label: PostgreSQL
+              value: postgresql
         - default: umami
           envKey: PANEL_DB_NAME
           labelEn: Database
diff --git a/apps/umami/2.4.1/docker-compose.yml b/apps/umami/2.8.0/docker-compose.yml
similarity index 56%
rename from apps/umami/2.4.1/docker-compose.yml
rename to apps/umami/2.8.0/docker-compose.yml
index 5959d188c..a1204f7b8 100644
--- a/apps/umami/2.4.1/docker-compose.yml
+++ b/apps/umami/2.8.0/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   umami:
-    image: ghcr.io/umami-software/umami:mysql-v2.8.0
+    image: ghcr.io/umami-software/umami:${PANEL_DB_TYPE}-v2.8.0
     container_name: ${CONTAINER_NAME}
     restart: always
     labels:
@@ -9,8 +9,8 @@ services:
     ports:
       - ${PANEL_APP_PORT_HTTP}:3000
     environment:
-      DATABASE_TYPE: mysql
-      DATABASE_URL: mysql://${PANEL_DB_USER}:${PANEL_DB_USER_PASSWORD}@${PANEL_DB_HOST}:3306/${PANEL_DB_NAME}
+      DATABASE_TYPE: ${PANEL_DB_TYPE}
+      DATABASE_URL: ${PANEL_DB_TYPE}://${PANEL_DB_USER}:${PANEL_DB_USER_PASSWORD}@${PANEL_DB_HOST}:${PANEL_DB_PORT}/${PANEL_DB_NAME}
       HASH_SALT: ${HASH_SALT}
     networks:
       - 1panel-network