改进 测试数据库 启动配置 (#916)

* 该进 测试数据库 启动配置

* update install-docker-compose.sh

* update database docker-compose.yaml

Author: jingjingxyk

.github/workflows/linux-x86_64.yml

@@ -126,10 +126,9 @@ jobs:
       - name: Start Database
         run: |
           # 准备数据库容器
-          export PATH=/usr/libexec/docker/cli-plugins/:$PATH
-          docker-compose version
+          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: |

sapi/src/UnitTest/scripts/database/docker-compose.yaml sapi/docker/database/docker-compose.yaml

@@ -1,8 +1,7 @@
-version: "3"
+name: "database"
 services:
   postgresql-server:
-    image: postgres:16-alpine
-    # image: postgis/postgis:16-3.4-alpine
+    image: postgres:17-alpine
     hostname: "postgresql"
     container_name: "postgresql"
     ports:

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 = ''
+
+
+

sapi/src/UnitTest/scripts/database/start.sh sapi/docker/database/start.sh

@@ -8,8 +8,8 @@ __DIR__=$(
 
 cd ${__DIR__}
 
-docker-compose -f docker-compose.yaml up -d
-docker-compose -f docker-compose.yaml ps
+docker compose -f docker-compose.yaml up -d
+docker compose -f docker-compose.yaml ps
 
 docker container ls -a
 

sapi/src/UnitTest/scripts/database/stop.sh sapi/docker/database/stop.sh

@@ -8,4 +8,4 @@ __DIR__=$(
 
 cd ${__DIR__}
 
-docker-compose -f docker-compose.yaml down --remove-orphans
+docker compose -f docker-compose.yaml down --remove-orphans

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