feat: flarum wordpress jumpserver typecho wiki.js 支持 MariaDB

apps/flarum/1.8.0/data.yml

@@ -3,27 +3,19 @@ additionalProperties:
         - child:
             default: ""
             envKey: PANEL_DB_HOST
-            labelEn: Database Service
-            labelZh: 数据库服务
             required: true
             type: service
           default: mysql
+          envKey: PANEL_DB_TYPE
           labelEn: Database Service
           labelZh: 数据库服务
-          params:
-            - envKey: FLARUM_DB_PORT
-              key: mysql
-              type: param
-              value: "3306"
-            - envKey: FLARUM_DB_PORT
-              key: postgresql
-              type: param
-              value: "5432"
           required: true
           type: apps
           values:
             - label: MySQL
               value: mysql
+            - label: MariaDB
+              value: mariadb
         - default: flarum
           envKey: PANEL_DB_NAME
           labelEn: Database

apps/flarum/1.8.0/docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - LISTEN_IPV6=true
       - REAL_IP_FROM=0.0.0.0/32
       - DB_HOST=${PANEL_DB_HOST}
-      - DB_PORT=${FLARUM_DB_PORT}
+      - DB_PORT=${PANEL_DB_PORT}
       - DB_NAME=${PANEL_DB_NAME}
       - DB_USER=${PANEL_DB_USER}
       - DB_PASSWORD=${PANEL_DB_USER_PASSWORD}

apps/halo/2.8.0/docker-compose.yml

@@ -17,7 +17,7 @@ services:
       retries: 5
       start_period: 30s
     command:
-      - --spring.r2dbc.url=r2dbc:pool:${HALO_PLATFORM}://${PANEL_DB_HOST}:${HALO_DB_PORT}/${PANEL_DB_NAME}
+      - --spring.r2dbc.url=r2dbc:pool:${HALO_PLATFORM}://${PANEL_DB_HOST}:${PANEL_DB_PORT}/${PANEL_DB_NAME}
       - --spring.r2dbc.username=${PANEL_DB_USER}
       - --spring.r2dbc.password=${PANEL_DB_USER_PASSWORD}
       - --spring.sql.init.platform=${HALO_PLATFORM}

apps/jumpserver/3.4.3/data.yml

@@ -42,13 +42,22 @@ additionalProperties:
           value: "ERROR"
         - label: CRITICAL
           value: "CRITICAL"
-    - default: ""
+    - child:
-      envKey: PANEL_DB_HOST
+        default: ""
-      key: mysql
+        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: MariaDB
+          value: mariadb
     - default: jumpserver
       envKey: PANEL_DB_NAME
       labelEn: Database

apps/jumpserver/3.4.3/docker-compose.yml

@@ -13,7 +13,7 @@ services:
       DEBUG: ${DEBUG:-FALSE}
       LOG_LEVEL: ${LOG_LEVEL}
       DB_HOST: ${PANEL_DB_HOST}
-      DB_PORT: 3306
+      DB_PORT: ${PANEL_DB_PORT}
       DB_USER: ${PANEL_DB_USER}
       DB_PASSWORD: ${PANEL_DB_USER_PASSWORD}
       DB_NAME: ${PANEL_DB_NAME}

apps/typecho/nightly-php7.4-apache/data.yml

@@ -1,12 +1,21 @@
 additionalProperties:
     formFields:
-        - default: ""
+        - child:
-          envKey: PANEL_DB_HOST
+            default: ""
-          key: mysql
+            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: MariaDB
+              value: mariadb
         - default: typecho
           envKey: PANEL_DB_NAME
           labelEn: Database

apps/typecho/nightly-php7.4-apache/docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - TYPECHO_DB_ADAPTER=Pdo_Mysql
       - TYPECHO_DB_HOST=${PANEL_DB_HOST}
       - TYPECHO_DB_DATABASE=${PANEL_DB_NAME}
-      - TYPECHO_DB_PORT=3306
+      - TYPECHO_DB_PORT=${PANEL_DB_PORT}
       - TYPECHO_DB_USER=${PANEL_DB_USER}
       - TYPECHO_DB_PASSWORD=${PANEL_DB_USER_PASSWORD}
       - TYPECHO_USER_NAME=${TYPECHO_USER_NAME}

apps/wikijs/2.5.300/data.yml

@@ -3,28 +3,19 @@ additionalProperties:
         - child:
             default: ""
             envKey: PANEL_DB_HOST
-            labelEn: Database Service
-            labelZh: 数据库服务
             required: true
             type: service
           default: mysql
-          envKey: WIKI_PLATFORM
+          envKey: PANEL_DB_TYPE
           labelEn: Database Service
           labelZh: 数据库服务
-          params:
-            - envKey: WIKI_DB_PORT
-              key: mysql
-              type: param
-              value: "3306"
-            - envKey: WIKI_DB_PORT
-              key: postgresql
-              type: param
-              value: "5432"
           required: true
           type: apps
           values:
             - label: MySQL
               value: mysql
+            - label: MariaDB
+              value: mariadb
         - default: wiki
           envKey: PANEL_DB_NAME
           labelEn: Database

apps/wordpress/6.3.1/data.yml

@@ -1,12 +1,21 @@
 additionalProperties:
     formFields:
-        - default: ""
+        - child:
-          envKey: PANEL_DB_HOST
+            default: ""
-          key: mysql
+            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: MariaDB
+              value: mariadb
         - default: word
           envKey: PANEL_DB_NAME
           labelEn: Database