该进测试数据库启动配置

swoole · Jan 25, 2025 · 48f25d0 · 48f25d0
1 parent e655263
commit 48f25d0
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 12 deletions.
diff --git 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/...Test/scripts/database/docker-compose.yaml → sapi/docker/database/docker-compose.yaml b/...Test/scripts/database/docker-compose.yaml → 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
@@ -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 → sapi/docker/database/start.sh b/sapi/src/UnitTest/scripts/database/start.sh → sapi/docker/database/start.sh
diff --git a/sapi/src/UnitTest/scripts/database/stop.sh → sapi/docker/database/stop.sh b/sapi/src/UnitTest/scripts/database/stop.sh → sapi/docker/database/stop.sh
diff --git 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