From 8e09a9f39cb9bcd4181595f0046bc809de685216 Mon Sep 17 00:00:00 2001
From: "fuhai999@gmail.com" <fuhai999@gmail.com>
Date: Fri, 17 May 2019 19:45:49 +0800
Subject: [PATCH] v2.0.1 release (^.^)YYa!!

---
 Dockerfile             | 21 +--------------------
 docker/Dockerfile.base | 10 ++++++++++
 docker/build-base.sh   |  1 +
 docker/push-base.sh    |  2 ++
 4 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 docker/Dockerfile.base
 create mode 100755 docker/build-base.sh
 create mode 100755 docker/push-base.sh

diff --git a/Dockerfile b/Dockerfile
index 7e952359f3..92f589c827 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,9 @@
-FROM maven:3.6-jdk-8-alpine
+FROM fuhai/jpress-base:v1.1
 LABEL maintainer="Michael Yang<fuhai999@gmail.com>"
 
 WORKDIR /opt/jpress
 ADD . /tmp
 
-ENV TZ=Asia/Shanghai
-RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && \
-    echo ${TZ} > /etc/timezone
-
-# 验证码图片渲染需要ttf的支持
-RUN apk add --update ttf-dejavu
-
-# 添加中文的支持
-RUN yum install kde-l10n-Chinese -y
-RUN yum reinstall glibc-common -y
-RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8
-ENV LC_ALL zh_CN.UTF-8
-
-ENV LANG=zh_CN.UTF-8 \
-    LANGUAGE=zh_CN:zh \
-    LC_ALL=zh_CN.UTF-8
-
 RUN cd /tmp && \
     cp -f /tmp/docker/build/settings.xml /usr/share/maven/conf/settings.xml && \
     mvn package -Pci && \
@@ -30,8 +13,6 @@ RUN cd /tmp && \
     cp -f /tmp/docker/build/jboot.properties /opt/jpress/config/jboot.properties && \
     rm -rf /tmp && \
     rm -rf ~/.m2 && \
-    rm -rf /opt/jpress/webapp/templates/NewJPress && \
-    rm -rf /opt/jpress/webapp/templates/BewTo && \
     rm -rf /opt/jpress/jpress.bat && \
     rm -rf /opt/jpress/config/undertow.txt && \
     rm -rf /opt/jpress/config/install.lock
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
new file mode 100644
index 0000000000..73894dd862
--- /dev/null
+++ b/docker/Dockerfile.base
@@ -0,0 +1,10 @@
+FROM maven:3.6-jdk-8-alpine
+LABEL maintainer="Michael Yang<fuhai999@gmail.com>"
+
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime && \
+    echo ${TZ} > /etc/timezone
+
+RUN apk add --update font-adobe-100dpi ttf-dejavu
+
+
diff --git a/docker/build-base.sh b/docker/build-base.sh
new file mode 100755
index 0000000000..93d62301f5
--- /dev/null
+++ b/docker/build-base.sh
@@ -0,0 +1 @@
+docker build . -t fuhai/jpress-base:v1.1 -f ./Dockerfile.base
\ No newline at end of file
diff --git a/docker/push-base.sh b/docker/push-base.sh
new file mode 100755
index 0000000000..2e8acdf50a
--- /dev/null
+++ b/docker/push-base.sh
@@ -0,0 +1,2 @@
+docker login
+docker push fuhai/jpress-base:v1.1
\ No newline at end of file