Merge pull request 'dev' (#6) from dev into beta
Reviewed-on: crm/crm-print#6
This commit is contained in:
commit
f412e56114
@ -1,7 +1,5 @@
|
||||
FROM openjdk:8u181-jre-alpine
|
||||
ENV LANG en_US.UTF-8
|
||||
RUN mkdir -p /usr/share/fonts/chinese
|
||||
COPY fonts/* /usr/share/fonts/chinese/
|
||||
RUN set -eux && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories &&\
|
||||
apk add tzdata &&\
|
||||
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone &&\
|
||||
@ -12,6 +10,7 @@ RUN set -eux && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk
|
||||
apk add msttcorefonts-installer &&\
|
||||
apk add fontconfig &&\
|
||||
apk --update add unzip &&\
|
||||
mkdir -p /usr/share/fonts/chinese &&\
|
||||
cd /tmp &&\
|
||||
wget http://kkfileview.keking.cn/fonts.zip &&\
|
||||
unzip -d /usr/share/fonts/chinese fonts.zip &&\
|
||||
@ -29,4 +28,4 @@ RUN set -eux && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk
|
||||
COPY ./server/target/crm-print-server-1.0.0.jar /
|
||||
WORKDIR /
|
||||
EXPOSE 9089
|
||||
CMD ["java","-Xms1000m","-Xmx1000m","-jar","crm-print-server-1.0.0.jar"]
|
||||
CMD ["java", "-Xms3072m", "-jar","crm-print-server-1.0.0.jar"]
|
||||
|
Loading…
x
Reference in New Issue
Block a user