diff --git a/apps/flarum/1.8.0/data.yml b/apps/flarum/1.8.0/data.yml index 7ef089be..9a7939dc 100755 --- a/apps/flarum/1.8.0/data.yml +++ b/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 diff --git a/apps/flarum/1.8.0/docker-compose.yml b/apps/flarum/1.8.0/docker-compose.yml index 50189fca..b2850ef5 100644 --- a/apps/flarum/1.8.0/docker-compose.yml +++ b/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} diff --git a/apps/halo/2.8.0/docker-compose.yml b/apps/halo/2.8.0/docker-compose.yml index 57c4a330..b7d9ee2f 100644 --- a/apps/halo/2.8.0/docker-compose.yml +++ b/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} diff --git a/apps/jumpserver/3.4.3/data.yml b/apps/jumpserver/3.4.3/data.yml index 187605c5..e8f4f93d 100644 --- a/apps/jumpserver/3.4.3/data.yml +++ b/apps/jumpserver/3.4.3/data.yml @@ -42,13 +42,22 @@ additionalProperties: value: "ERROR" - label: CRITICAL value: "CRITICAL" - - 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: MariaDB + value: mariadb - default: jumpserver envKey: PANEL_DB_NAME labelEn: Database diff --git a/apps/jumpserver/3.4.3/docker-compose.yml b/apps/jumpserver/3.4.3/docker-compose.yml index e0e29079..0ac399dd 100644 --- a/apps/jumpserver/3.4.3/docker-compose.yml +++ b/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} diff --git a/apps/typecho/nightly-php7.4-apache/data.yml b/apps/typecho/nightly-php7.4-apache/data.yml index d3ca400f..0b5ca35a 100755 --- a/apps/typecho/nightly-php7.4-apache/data.yml +++ b/apps/typecho/nightly-php7.4-apache/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: MariaDB + value: mariadb - default: typecho envKey: PANEL_DB_NAME labelEn: Database diff --git a/apps/typecho/nightly-php7.4-apache/docker-compose.yml b/apps/typecho/nightly-php7.4-apache/docker-compose.yml index 7099dc02..a7d92308 100644 --- a/apps/typecho/nightly-php7.4-apache/docker-compose.yml +++ b/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} diff --git a/apps/wikijs/2.5.300/data.yml b/apps/wikijs/2.5.300/data.yml index 57676776..7d93fa0f 100755 --- a/apps/wikijs/2.5.300/data.yml +++ b/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 diff --git a/apps/wordpress/6.3.1/data.yml b/apps/wordpress/6.3.1/data.yml index 83de3307..fcaeaa83 100755 --- a/apps/wordpress/6.3.1/data.yml +++ b/apps/wordpress/6.3.1/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: MariaDB + value: mariadb - default: word envKey: PANEL_DB_NAME labelEn: Database