diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-04-12 08:37:46 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-04-12 08:37:46 +0000 |
| commit | 033892bb84bd4792b76ce2bd5f4c44d99148474d (patch) | |
| tree | 70cdce19a2bc73ec0d79d079ec1173e93dd40da6 | |
| parent | 5452656a09def98a20d264bf79a2cbf1298f1d22 (diff) | |
fixes #3988
Closes #3988
Merge request studip/studip!2852
| -rw-r--r-- | docker-compose-dev.yml | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rw-r--r-- | docker/studip/my.cnf | 13 |
3 files changed, 15 insertions, 2 deletions
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index f202a07..6e74c71 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 d96342f..492671d 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 0000000..5e34466 --- /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 |