From 85d50caa09d91e55cd8e69c45e8a7969a9ddc792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Mon, 21 Feb 2022 12:04:29 +0900 Subject: [PATCH] =?UTF-8?q?=E8=A8=80=E8=AA=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- infra/mysql/Dockerfile | 5 ++++- infra/mysql/my.cnf | 6 ++++-- infra/php/Dockerfile | 6 +++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/infra/mysql/Dockerfile b/infra/mysql/Dockerfile index 6d401c97..022df436 100644 --- a/infra/mysql/Dockerfile +++ b/infra/mysql/Dockerfile @@ -6,7 +6,10 @@ ENV MYSQL_DATABASE=laravel_local \ MYSQL_ROOT_PASSWORD=secret \ TZ=Asia/Tokyo +RUN export LC_ALL=ja_JP.UTF-8 +RUN export LANG=ja_JP.UTF-8 + COPY ./my.cnf /etc/my.cnf RUN chmod 644 /etc/my.cnf # COPY ./my.cnf /etc/mysql/conf.d/my.cnf -# RUN chmod 644 /etc/mysql/conf.d/my.cnf \ No newline at end of file +# RUN chmod 644 /etc/mysql/conf.d/my.cnf diff --git a/infra/mysql/my.cnf b/infra/mysql/my.cnf index bfcbd98b..8618b286 100644 --- a/infra/mysql/my.cnf +++ b/infra/mysql/my.cnf @@ -21,7 +21,9 @@ general_log = 1 general_log_file = mysql-general.log [mysql] -default-character-set = utf8mb4 +#default-character-set = utf8mb4 +default-character-set = utf8mb3 [client] -default-character-set = utf8mb4 \ No newline at end of file +#default-character-set = utf8mb4 +default-character-set = utf8mb3 diff --git a/infra/php/Dockerfile b/infra/php/Dockerfile index 216bea1b..7e6c2692 100644 --- a/infra/php/Dockerfile +++ b/infra/php/Dockerfile @@ -13,8 +13,12 @@ RUN apt-get install -y nodejs # yarnをインストール RUN apt-get update -RUN apt-get -y install git unzip libzip-dev libicu-dev libonig-dev zlib1g-dev cron mariadb-client +RUN apt-get -y install git unzip libzip-dev libicu-dev libonig-dev zlib1g-dev cron mariadb-client locales RUN apt-get clean +RUN echo "ja_JP.UTF-8 UTF-8" >> /etc/locale.gen +RUN echo "export LANG=ja_JP.UTF-8" >> ~/.bashrc +RUN echo "export LANGUAGE=ja_JP.UTF-8" >> ~/.bashrc +RUN locale-gen && update-locale LANG=ja_JP.UTF-8 RUN curl --output libpng16-16_1.6.36-6_amd64.deb http://ftp.jp.debian.org/debian/pool/main/libp/libpng1.6/libpng16-16_1.6.36-6_amd64.deb RUN curl --output libpng-dev_1.6.36-6_amd64.deb http://ftp.jp.debian.org/debian/pool/main/libp/libpng1.6/libpng-dev_1.6.36-6_amd64.deb RUN curl --output libjpeg62-turbo_1.5.2-2+deb10u1_amd64.deb http://ftp.jp.debian.org/debian/pool/main/libj/libjpeg-turbo/libjpeg62-turbo_1.5.2-2+deb10u1_amd64.deb