From f14deee7baaf82e7aad6fc81a2509ba88e869afd Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 02 Nov 2020 15:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-uaa/kidgrow-uaa-server/Dockerfile | 82 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 2 deletions(-)
diff --git a/kidgrow-uaa/kidgrow-uaa-server/Dockerfile b/kidgrow-uaa/kidgrow-uaa-server/Dockerfile
index fef5f1e..af7a2e0 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/Dockerfile
+++ b/kidgrow-uaa/kidgrow-uaa-server/Dockerfile
@@ -1,7 +1,85 @@
# 基础镜像
-FROM openjdk:8-jdk-alpine
+FROM 182.92.99.224:8081/kidgrow/docker.private/openjdk:fonts
+#FROM openjdk:8-jdk-alpine
# 作者（可选）
MAINTAINER kidgrow
+##时区
+RUN echo "Asia/Shanghai" > /etc/timezone
+#captcher 字体包
+COPY dockerfont/32768no.ttf /usr/share/fonts/32768no.ttf
+COPY dockerfont/7hours.ttf /usr/share/fonts/7hours.ttf
+COPY dockerfont/actionj.ttf /usr/share/fonts/actionj.ttf
+COPY dockerfont/ANGSTROM.TTF /usr/share/fonts/ANGSTROM.ttf
+COPY dockerfont/antelope.ttf /usr/share/fonts/antelope.ttf
+COPY dockerfont/antiblue.ttf /usr/share/fonts/antiblue.ttf
+COPY dockerfont/bboron.ttf /usr/share/fonts/bboron.ttf
+COPY dockerfont/BTTSOIEF.TTF /usr/share/fonts/BTTSOIEF.ttf
+COPY dockerfont/codon.ttf /usr/share/fonts/codon.ttf
+COPY dockerfont/colophon.ttf /usr/share/fonts/colophon.ttf
+COPY dockerfont/constant.ttf /usr/share/fonts/constant.ttf
+COPY dockerfont/cosinek.ttf /usr/share/fonts/cosinek.ttf
+COPY dockerfont/cwisdom.ttf /usr/share/fonts/cwisdom.ttf
+COPY dockerfont/davis.ttf /usr/share/fonts/davis.ttf
+COPY dockerfont/dis.ttf /usr/share/fonts/dis.ttf
+COPY dockerfont/dnahand.ttf /usr/share/fonts/dnahand.ttf
+COPY dockerfont/DoctorAz.ttf /usr/share/fonts/DoctorAz.ttf
+COPY dockerfont/donner.ttf /usr/share/fonts/donner.ttf
+COPY dockerfont/DOVES.TTF /usr/share/fonts/DOVES.ttf
+COPY dockerfont/dyspro.ttf /usr/share/fonts/dyspro.ttf
+COPY dockerfont/epilog.ttf /usr/share/fonts/epilog.ttf
+COPY dockerfont/faraday.ttf /usr/share/fonts/faraday.ttf
+COPY dockerfont/fresnel.ttf /usr/share/fonts/fresnel.ttf
+COPY dockerfont/gauss.ttf /usr/share/fonts/gauss.ttf
+COPY dockerfont/geodesic.ttf /usr/share/fonts/geodesic.ttf
+COPY dockerfont/germs.ttf /usr/share/fonts/germs.ttf
+COPY dockerfont/gmt.ttf /usr/share/fonts/gmt.ttf
+COPY dockerfont/guildof.ttf /usr/share/fonts/guildof.ttf
+COPY dockerfont/headache.ttf /usr/share/fonts/headache.ttf
+COPY dockerfont/hydrogen.ttf /usr/share/fonts/hydrogen.ttf
+COPY dockerfont/initial.ttf /usr/share/fonts/initial.ttf
+COPY dockerfont/levity.ttf /usr/share/fonts/levity.ttf
+COPY dockerfont/lexo.ttf /usr/share/fonts/lexo.ttf
+COPY dockerfont/linear.ttf /usr/share/fonts/linear.ttf
+COPY dockerfont/MAYQUEEN.TTF /usr/share/fonts/MAYQUEEN.ttf
+COPY dockerfont/melanie.ttf /usr/share/fonts/melanie.ttf
+COPY dockerfont/metalang.ttf /usr/share/fonts/metalang.ttf
+COPY dockerfont/musicdbz.ttf /usr/share/fonts/musicdbz.ttf
+COPY dockerfont/natlog.ttf /usr/share/fonts/natlog.ttf
+COPY dockerfont/nonblock.ttf /usr/share/fonts/nonblock.ttf
+COPY dockerfont/nullp.ttf /usr/share/fonts/nullp.ttf
+COPY dockerfont/opticbot.ttf /usr/share/fonts/opticbot.ttf
+COPY dockerfont/pinball.ttf /usr/share/fonts/pinball.ttf
+COPY dockerfont/prefix.ttf /usr/share/fonts/prefix.ttf
+COPY dockerfont/progbot.ttf /usr/share/fonts/progbot.ttf
+COPY dockerfont/PROTERON.TTF /usr/share/fonts/PROTERON.ttf
+COPY dockerfont/px10.ttf /usr/share/fonts/px10.ttf
+COPY dockerfont/ransom.ttf /usr/share/fonts/ransom.ttf
+COPY dockerfont/resurgen.ttf /usr/share/fonts/resurgen.ttf
+COPY dockerfont/robot.ttf /usr/share/fonts/robot.ttf
+COPY dockerfont/scandal.ttf /usr/share/fonts/scandal.ttf
+COPY dockerfont/secret.ttf /usr/share/fonts/secret.ttf
+COPY dockerfont/signal.ttf /usr/share/fonts/signal.ttf
+COPY dockerfont/SUBMERGD.TTF /usr/share/fonts/SUBMERGD.ttf
+COPY dockerfont/suckgolf.ttf /usr/share/fonts/suckgolf.ttf
+COPY dockerfont/technet.ttf /usr/share/fonts/technet.ttf
+COPY dockerfont/tetanus.ttf /usr/share/fonts/tetanus.ttf
+COPY dockerfont/thisprty.ttf /usr/share/fonts/thisprty.ttf
+COPY dockerfont/toast.ttf /usr/share/fonts/toast.ttf
+COPY dockerfont/TOMBATS1.TTF /usr/share/fonts/TOMBATS1.ttf
+COPY dockerfont/tombats3.ttf /usr/share/fonts/tombats3.ttf
+COPY dockerfont/tombats4.ttf /usr/share/fonts/tombats4.ttf
+COPY dockerfont/tombats6.ttf /usr/share/fonts/tombats6.ttf
+COPY dockerfont/tombats7.ttf /usr/share/fonts/tombats7.ttf
+COPY dockerfont/tombots.ttf /usr/share/fonts/tombots.ttf
+COPY dockerfont/tomhand.ttf /usr/share/fonts/tomhand.ttf
+COPY dockerfont/tommys.ttf /usr/share/fonts/tommys.ttf
+COPY dockerfont/tomnr.ttf /usr/share/fonts/tomnr.ttf
+COPY dockerfont/tsmiles.ttf /usr/share/fonts/tsmiles.ttf
+COPY dockerfont/tuesday.ttf /usr/share/fonts/tuesday.ttf
+COPY dockerfont/valium.ttf /usr/share/fonts/valium.ttf
+COPY dockerfont/wolves.ttf /usr/share/fonts/wolves.ttf
+COPY dockerfont/yikatu.ttf /usr/share/fonts/yikatu.ttf
+COPY dockerfont/zincboom.ttf /usr/share/fonts/zincboom.ttf
# 删除无用组件 优化容器体积（可选）
RUN rm -rf /var/lib/apt/lists/*
# 创建jar包存放目录
@@ -11,4 +89,4 @@
# copy当前工程jar包至容器内
COPY ${JAR_FILE} /usr/local/kidgrow/app.jar
# 运行jar包
-ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-Xms64m","-Xmx256m","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
--
Gitblit v1.8.0