Merge pull request #2173 from ISAWASHUN/feature/#1876

traPtitech · Jan 1, 2024 · f56bcca · f56bcca
2 parents f37f6ca + 8967c81
commit f56bcca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/compose.yaml b/compose.yaml
@@ -50,7 +50,7 @@ services:
       MYSQL_ROOT_PASSWORD: password
       MYSQL_DATABASE: traq
     # conohaのDBのデフォルトCharsetはutf8
-    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
+    command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci
     expose:
       - "3306"
     ports:

diff --git a/dev/bin/up-test-db.sh b/dev/bin/up-test-db.sh
@@ -15,6 +15,6 @@ if docker ps --all | grep ${containername} > /dev/null; then
 else
     echo "create ${containername} docker container"
     docker run --name ${containername} -p ${port}:3306 -e MYSQL_ROOT_PASSWORD=password -e MYSQL_DATABASE=traq -d mariadb:10.6.4 \
-           mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
+           mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci
 fi