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