From 48e65c8ef63d348a95821a7ee61f3b0ee5be60b7 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Wed, 3 Jan 2024 11:04:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20halo=20=E5=92=8C=20gitea=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20postgres=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=20(#776)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/gitea/1.21.3/data.yml           | 17 +++++++++++++----
 apps/gitea/1.21.3/docker-compose.yml |  4 ++--
 apps/halo/2.11.3/data.yml            |  2 ++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/apps/gitea/1.21.3/data.yml b/apps/gitea/1.21.3/data.yml
index 3a3d3faa..6145fe07 100755
--- a/apps/gitea/1.21.3/data.yml
+++ b/apps/gitea/1.21.3/data.yml
@@ -1,12 +1,21 @@
 additionalProperties:
     formFields:
-        - default: ""
-          envKey: PANEL_DB_HOST
-          key: mysql
+        - default: mysql
+          envKey: PANEL_DB_TYPE
           labelEn: Database Service
           labelZh: 数据库服务
           required: true
-          type: service
+          type: apps
+          child:
+            default: ""
+            envKey: PANEL_DB_HOST
+            required: true
+            type: service
+          values:
+            - label: MySQL
+              value: mysql
+            - label: PostgreSQL
+              value: postgres
         - default: gitea
           envKey: PANEL_DB_NAME
           labelEn: Database
diff --git a/apps/gitea/1.21.3/docker-compose.yml b/apps/gitea/1.21.3/docker-compose.yml
index 1f9eb10a..7f7813d9 100644
--- a/apps/gitea/1.21.3/docker-compose.yml
+++ b/apps/gitea/1.21.3/docker-compose.yml
@@ -6,8 +6,8 @@ services:
     environment:
       - USER_UID=1000
       - USER_GID=1000
-      - GITEA__database__DB_TYPE=mysql
-      - GITEA__database__HOST=${PANEL_DB_HOST}:3306
+      - GITEA__database__DB_TYPE=${PANEL_DB_TYPE}
+      - GITEA__database__HOST=${PANEL_DB_HOST}:${PANEL_DB_PORT}
       - GITEA__database__NAME=${PANEL_DB_NAME}
       - GITEA__database__USER=${PANEL_DB_USER}
       - GITEA__database__PASSWD=${PANEL_DB_USER_PASSWORD}
diff --git a/apps/halo/2.11.3/data.yml b/apps/halo/2.11.3/data.yml
index 351ff2cd..1705aa30 100644
--- a/apps/halo/2.11.3/data.yml
+++ b/apps/halo/2.11.3/data.yml
@@ -16,6 +16,8 @@ additionalProperties:
               value: mysql
             - label: MariaDB
               value: mariadb
+            - label: PostgreSQL
+              value: postgresql
         - default: halo
           envKey: PANEL_DB_NAME
           labelEn: Database