From ab50df49362a83cca3cf8f2d2d8e7d7edd0148cb Mon Sep 17 00:00:00 2001 From: Endial Fang Date: Sat, 18 Jul 2020 11:11:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85locales=EF=BC=8C=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E9=BB=98=E8=AE=A4=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 66b8853..e33dd5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,13 +28,14 @@ deb-src http://mirrors.aliyun.com/debian/ buster-backports main contrib non-free \ apt-get update; \ apt-get upgrade -y; \ + apt-get install -y --no-install-recommends locales; \ savedAptMark="$(apt-mark showmanual)"; \ - apt-get install -y locales; \ \ # 安装 UTF-8 编码。需要安装 locales 软件包 - localedef -c -i en_US -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8; \ - echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen; \ - update-locale LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LC_ALL=en_US.UTF-8 LC_MESSAGES=POSIX && dpkg-reconfigure locales; \ +# localedef -c -i en_US -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8; \ + sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen; \ + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 LANGUAGE=en_US.UTF-8 LC_MESSAGES=POSIX; \ + dpkg-reconfigure -f noninteractive locales; \ \ fetchDeps=" \ ca-certificates \ @@ -52,7 +53,7 @@ deb-src http://mirrors.aliyun.com/debian/ buster-backports main contrib non-free wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${gosu_ver}/gosu-$dpkgArch.asc"; \ \ # 安装软件包需要使用的GPG证书，并验证软件 - GPG_KEYS="0xB42F6819007F00F88E364FD4036A9C25BF357DD4" + GPG_KEYS="0xB42F6819007F00F88E364FD4036A9C25BF357DD4"; \ export GNUPGHOME="$(mktemp -d)"; \ for key in ${GPG_KEYS}; do \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${key}"|| \