From 48f25d0e8a0e36659cf4944b2cbddcc61780baa6 Mon Sep 17 00:00:00 2001
From: jingjingxyk <zonghengbaihe521@qq.com>
Date: Sat, 25 Jan 2025 11:09:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A5=E8=BF=9B=20=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=20=E5=90=AF=E5=8A=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/linux-x86_64.yml            |  2 +-
 .../database/docker-compose.yaml              |  2 +-
 sapi/docker/database/my.cnf                   | 27 +++++++++++++++++++
 .../scripts => docker}/database/start.sh      |  0
 .../scripts => docker}/database/stop.sh       |  0
 .../linux/install-docker-compose.sh           |  5 ++--
 sapi/src/UnitTest/scripts/database/my.cnf     |  8 ------
 7 files changed, 32 insertions(+), 12 deletions(-)
 rename sapi/{src/UnitTest/scripts => docker}/database/docker-compose.yaml (97%)
 create mode 100644 sapi/docker/database/my.cnf
 rename sapi/{src/UnitTest/scripts => docker}/database/start.sh (100%)
 rename sapi/{src/UnitTest/scripts => docker}/database/stop.sh (100%)
 delete mode 100644 sapi/src/UnitTest/scripts/database/my.cnf

diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
index 1c3d6b417f..45c6aa682c 100644
--- a/.github/workflows/linux-x86_64.yml
+++ b/.github/workflows/linux-x86_64.yml
@@ -129,7 +129,7 @@ jobs:
           export PATH=/usr/libexec/docker/cli-plugins/:$PATH
           docker-compose version
           docker container ls -a
-          bash sapi/src/UnitTest/scripts/database/start.sh
+          bash sapi/docker/database/start.sh
 
       - name: Show Build Result
         run: |
diff --git a/sapi/src/UnitTest/scripts/database/docker-compose.yaml b/sapi/docker/database/docker-compose.yaml
similarity index 97%
rename from sapi/src/UnitTest/scripts/database/docker-compose.yaml
rename to sapi/docker/database/docker-compose.yaml
index 1b0a17061a..6444f1e9d0 100644
--- a/sapi/src/UnitTest/scripts/database/docker-compose.yaml
+++ b/sapi/docker/database/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   postgresql-server:
-    image: postgres:16-alpine
+    image: postgres:17-alpine
     # image: postgis/postgis:16-3.4-alpine
     hostname: "postgresql"
     container_name: "postgresql"
diff --git a/sapi/docker/database/my.cnf b/sapi/docker/database/my.cnf
new file mode 100644
index 0000000000..d934c69412
--- /dev/null
+++ b/sapi/docker/database/my.cnf
@@ -0,0 +1,27 @@
+
+[client]
+default-character-set=utf8mb4
+[mysql]
+default-character-set=utf8mb4
+
+[mysqld]
+skip_ssl
+skip-ssl-session-cache-mode
+
+# bind-address = 0.0.0.0
+bind-address = 0.0.0.0
+# bind-address = ::
+
+# 跳过密码登录
+# skip-grant-tables
+
+collation-server = utf8mb4_unicode_ci
+init-connect='SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci'
+character-set-server = utf8mb4
+innodb_ft_min_token_size = 1
+ft_min_word_len = 1
+innodb_ft_enable_stopword = OFF
+ft_stopword_file = ''
+
+
+
diff --git a/sapi/src/UnitTest/scripts/database/start.sh b/sapi/docker/database/start.sh
similarity index 100%
rename from sapi/src/UnitTest/scripts/database/start.sh
rename to sapi/docker/database/start.sh
diff --git a/sapi/src/UnitTest/scripts/database/stop.sh b/sapi/docker/database/stop.sh
similarity index 100%
rename from sapi/src/UnitTest/scripts/database/stop.sh
rename to sapi/docker/database/stop.sh
diff --git a/sapi/quickstart/linux/install-docker-compose.sh b/sapi/quickstart/linux/install-docker-compose.sh
index d1ed6900a8..c63b53009d 100644
--- a/sapi/quickstart/linux/install-docker-compose.sh
+++ b/sapi/quickstart/linux/install-docker-compose.sh
@@ -24,13 +24,14 @@ if [ ! -f /usr/libexec/docker/cli-plugins/docker-compose ]; then
 
   # show more version info
   # https://github.com/docker/compose/releases
-  VERSION="v2.32.1"
+  VERSION="v2.32.4"
 
   curl -fsSL "https://github.com/docker/compose/releases/download/${VERSION}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 
   chmod +x /usr/local/bin/docker-compose
 else
-  export PATH=/usr/libexec/docker/cli-plugins/:$PATH
+  # export PATH=/usr/libexec/docker/cli-plugins/:$PATH
+  ln -sf /usr/libexec/docker/cli-plugins/docker-compose usr/local/bin/docker-compose
 fi
 
 docker-compose --version
diff --git a/sapi/src/UnitTest/scripts/database/my.cnf b/sapi/src/UnitTest/scripts/database/my.cnf
deleted file mode 100644
index 43c51e9992..0000000000
--- a/sapi/src/UnitTest/scripts/database/my.cnf
+++ /dev/null
@@ -1,8 +0,0 @@
-[mysqld]
-skip_ssl
-skip-ssl-session-cache-mode
-
-bind-address = 0.0.0.0
-# bind-address = ::
-
-# skip-grant-tables