From 033892bb84bd4792b76ce2bd5f4c44d99148474d Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 12 Apr 2024 08:37:46 +0000
Subject: [PATCH] fixes #3988
Closes #3988
Merge request studip/studip!2852
---
docker-compose-dev.yml | 2 +-
docker-compose.yml | 2 +-
docker/studip/my.cnf | 13 +++++++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 docker/studip/my.cnf
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index f202a0717cb..6e74c71340c 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -5,7 +5,7 @@ services:
image: mariadb:10.4
volumes:
- db_data:/var/lib/mysql
- command: mysqld --sql_mode=""
+ - ./docker/studip/my.cnf:/etc/mysql/conf.d/my.cnf:ro
restart: always
environment:
MYSQL_RANDOM_ROOT_PASSWORD: 1
diff --git a/docker-compose.yml b/docker-compose.yml
index d96342fed20..492671dbb0b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
image: mariadb:10.4
volumes:
- db_data:/var/lib/mysql
- command: mysqld --sql_mode=""
+ - ./docker/studip/my.cnf:/etc/mysql/conf.d/my.cnf:ro
restart: always
environment:
MYSQL_RANDOM_ROOT_PASSWORD: 1
diff --git a/docker/studip/my.cnf b/docker/studip/my.cnf
new file mode 100644
index 00000000000..5e3446668a9
--- /dev/null
+++ b/docker/studip/my.cnf
@@ -0,0 +1,13 @@
+[client]
+default-character-set = utf8mb4
+
+[mysql]
+default-character-set = utf8mb4
+
+[mysqld]
+init_connect='SET NAMES UTF8MB4'
+character-set-server = utf8mb4
+collation-server = utf8mb4_unicode_ci
+
+innodb_file_per_table = On
+sql_mode = NO_ENGINE_SUBSTITUTION
--
GitLab