From 7315ddc4ea937bc33d601d8fd3b56e53b7de4c9a Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Tue, 25 Oct 2016 15:51:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=B4=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20mariadb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/mariadb/Dockerfile | 2 +- docker/mariadb/custom.cnf | 9 +++++++++ docker/mariadb/mariadb.cnf | 0 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 docker/mariadb/custom.cnf delete mode 100644 docker/mariadb/mariadb.cnf diff --git a/docker/mariadb/Dockerfile b/docker/mariadb/Dockerfile index 20afa74..68358b6 100644 --- a/docker/mariadb/Dockerfile +++ b/docker/mariadb/Dockerfile @@ -1,6 +1,6 @@ FROM mariadb:10.0 -COPY mariadb.cnf /etc/mysql/conf.d +COPY custom.cnf /etc/mysql/conf.d/ ENTRYPOINT ["docker-entrypoint.sh"] CMD ["mysqld"] diff --git a/docker/mariadb/custom.cnf b/docker/mariadb/custom.cnf new file mode 100644 index 0000000..0cf5418 --- /dev/null +++ b/docker/mariadb/custom.cnf @@ -0,0 +1,9 @@ +[mysql] +default-character-set = utf8 + +[mysqld] +character-set-server = utf8 +collation-server = utf8_general_ci + +[client] +default-character-set = utf8 diff --git a/docker/mariadb/mariadb.cnf b/docker/mariadb/mariadb.cnf deleted file mode 100644 index e69de29..0000000