diff --git a/Dockerfile_samba b/Dockerfile_samba index b1bc353..f9c1cbb 100644 --- a/Dockerfile_samba +++ b/Dockerfile_samba @@ -51,7 +51,7 @@ RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n && yum -y install kde-l10n-Chinese \ && yum -y reinstall glibc-common \ && localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 \ - && echo 'LANG="zh_CN.UTF-8"' >> /etc/locale.conf \ + && echo 'LANG="zh_CN.UTF-8"' > /etc/locale.conf \ && echo 'export LC_ALL="zh_CN.UTF-8"' >> ~/.bashrc EXPOSE 9000/tcp diff --git a/bin/install.sh b/bin/install.sh index 7dd58c8..66e693c 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -26,7 +26,7 @@ sed -i 's/upload_max_filesize = 2M/upload_max_filesize = 10M/g' php.ini yum -y install kde-l10n-Chinese yum -y reinstall glibc-common localedef -c -f UTF-8 -i zh_CN zh_CN.utf8 -echo 'LANG="zh_CN.UTF-8"' >> /etc/locale.conf +echo 'LANG="zh_CN.UTF-8"' > /etc/locale.conf echo 'export LC_ALL="zh_CN.UTF-8"' >> ~/.bashrc ## start php-fpm in background diff --git a/conf/smb.conf b/conf/smb.conf index 20211c8..5c007d7 100644 --- a/conf/smb.conf +++ b/conf/smb.conf @@ -1,7 +1,6 @@ [global] dos charset = cp866 unix charset = UTF8 - display charset = UTF8 [machete] path = /var/www/sambashare/filesite