From 18d08a201426b68b087f778a5595f90b8128edc3 Mon Sep 17 00:00:00 2001 From: wanghe-fit2cloud Date: Tue, 23 Jan 2024 14:23:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20Typecho=20=E5=85=BC=E5=AE=B9=20PostgreS?= =?UTF-8?q?QL=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/typecho/nightly-php7.4-apache/data.yml | 2 ++ .../nightly-php7.4-apache/docker-compose.yml | 2 +- .../nightly-php7.4-apache/scripts/init.sh | 25 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 apps/typecho/nightly-php7.4-apache/scripts/init.sh diff --git a/apps/typecho/nightly-php7.4-apache/data.yml b/apps/typecho/nightly-php7.4-apache/data.yml index a7415f72..a6ab4cfa 100755 --- a/apps/typecho/nightly-php7.4-apache/data.yml +++ b/apps/typecho/nightly-php7.4-apache/data.yml @@ -16,6 +16,8 @@ additionalProperties: value: mysql - label: MariaDB value: mariadb + - label: PostgreSQL + value: postgresql - 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 a7d92308..9cf2aee0 100644 --- a/apps/typecho/nightly-php7.4-apache/docker-compose.yml +++ b/apps/typecho/nightly-php7.4-apache/docker-compose.yml @@ -6,7 +6,7 @@ services: restart: always environment: - TYPECHO_INSTALL=1 - - TYPECHO_DB_ADAPTER=Pdo_Mysql + - TYPECHO_DB_ADAPTER=${TYPECHO_DB_ADAPTER} - TYPECHO_DB_HOST=${PANEL_DB_HOST} - TYPECHO_DB_DATABASE=${PANEL_DB_NAME} - TYPECHO_DB_PORT=${PANEL_DB_PORT} diff --git a/apps/typecho/nightly-php7.4-apache/scripts/init.sh b/apps/typecho/nightly-php7.4-apache/scripts/init.sh new file mode 100644 index 00000000..6d4327c0 --- /dev/null +++ b/apps/typecho/nightly-php7.4-apache/scripts/init.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +if [ -f ./.env ]; then + if grep -q "PANEL_DB_TYPE" ./.env; then + echo "PANEL_DB_TYPE 已存在" + else + echo 'PANEL_DB_TYPE="mysql"' >> ./.env + fi + + if grep -q "TYPECHO_DB_ADAPTER" ./.env; then + echo "TYPECHO_DB_ADAPTER 已存在" + else + PANEL_DB_TYPE_VALUE=$(grep -E '^PANEL_DB_TYPE=' ./.env | cut -d '=' -f 2) + + if [[ "$PANEL_DB_TYPE_VALUE" =~ mysql ]]; then + echo 'TYPECHO_DB_ADAPTER="Pdo_Mysql"' >> ./.env + elif [[ "$PANEL_DB_TYPE_VALUE" =~ mariadb ]]; then + echo 'TYPECHO_DB_ADAPTER="Pdo_Mysql"' >> ./.env + elif [[ "$PANEL_DB_TYPE_VALUE" =~ postgresql ]]; then + echo 'TYPECHO_DB_ADAPTER="Pdo_Pgsql"' >> ./.env + fi + fi +else + echo ".env 文件不存在" +fi \ No newline at end of file