From 2ccc5beedae58952bffc071e8063fb35e531cf9c Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Tue, 8 Dec 2020 20:22:48 +0800
Subject: [PATCH] =?UTF-8?q?perf(Dockerfile):=20=E4=B8=8D=E5=86=8D=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8zh=5FCN.UTF-8,=20en=5FUS.UTF-8=20=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E4=B9=9F=E6=98=AF=E5=8F=AF=E4=BB=A5=E7=9A=84=20(#5190)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf(Dockerfile): 不再使用zh_CN.UTF-8, en_US.UTF-8 应该也是可以的

* fix: 还原回原来的LANG设置

* perf: 合并层数

* feat: 修改Dockerfile

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Bai <bugatti_it@163.com>
---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f88dbe4b5..5ed72c554 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,8 +21,10 @@ WORKDIR /opt/jumpserver
 COPY ./requirements/deb_buster_requirements.txt ./requirements/deb_buster_requirements.txt
 RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list \
     && sed -i 's/security.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list \
-    && apt update
-RUN grep -v '^#' ./requirements/deb_buster_requirements.txt | xargs apt -y install
+    && apt update \
+    && grep -v '^#' ./requirements/deb_buster_requirements.txt | xargs apt -y install \
+    && localedef -c -f UTF-8 -i zh_CN zh_CN.UTF-8 \
+    && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
 COPY ./requirements/requirements.txt ./requirements/requirements.txt
 RUN pip install --upgrade pip==20.2.4 setuptools==49.6.0 wheel==0.34.2 -i ${PIP_MIRROR} \
@@ -39,7 +41,6 @@ VOLUME /opt/jumpserver/data
 VOLUME /opt/jumpserver/logs
 
 ENV LANG=zh_CN.UTF-8
-ENV LC_ALL=zh_CN.UTF-8
 
 EXPOSE 8070
 EXPOSE 8080