Skip to content

Commit

Permalink
v2.0.1 release (^.^)YYa!!
Browse files Browse the repository at this point in the history
  • Loading branch information
yangfuhai committed May 17, 2019
1 parent 6edcd1f commit 8e09a9f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 20 deletions.
21 changes: 1 addition & 20 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,9 @@
FROM maven:3.6-jdk-8-alpine
FROM fuhai/jpress-base:v1.1
LABEL maintainer="Michael Yang<[email protected]>"

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 && \
Expand All @@ -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
Expand Down
10 changes: 10 additions & 0 deletions docker/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM maven:3.6-jdk-8-alpine
LABEL maintainer="Michael Yang<[email protected]>"

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


1 change: 1 addition & 0 deletions docker/build-base.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docker build . -t fuhai/jpress-base:v1.1 -f ./Dockerfile.base
2 changes: 2 additions & 0 deletions docker/push-base.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
docker login
docker push fuhai/jpress-base:v1.1

0 comments on commit 8e09a9f

Please sign in to comment.