zhangqiankun 3 年之前
父節點
當前提交
152d05fe08
共有 2 個文件被更改,包括 10 次插入11 次删除
  1. 8 9
      doc/docker/Dockerfile
  2. 2 2
      doc/docker/calendar-center.yaml

+ 8 - 9
doc/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.persagy.com/base/centos:v-jdk1.8
+FROM java:8-jre
 MAINTAINER zhangqiankun<zhangqiankun@persagy.com>
 
 LABEL tier backend
@@ -6,23 +6,22 @@ LABEL product integrated
 LABEL project calendar-center
 LABEL name 工作历
 
-FROM registry.persagy.com/base/centos:v-jdk1.8
+ENV JAVA_OPTS -Dfile.encoding=UTF-8 -Xms2048m -Xmx2048m
+ENV TZ Asia/Shanghai
 ARG WORKER_HOME
-ENV TZ=Asia/Shanghai
-ENV JAVA_OPTS -Dfile.encoding=UTF-8 -XX:+UseContainerSupport -XX:InitialRAMPercentage=80.0 -XX:MaxRAMPercentage=80.0 -XX:MinRAMPercentage=80.0
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezon
-#增加一个arthas的包,方便应用排查问题
-RUN yum install -y unzip zip wget telnet tzdata
-COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
+
+RUN apt-get install -y --no-install-recommends tzdata && rm -rf /var/lib/apt/lists/*
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime	&& echo 'Asia/Shanghai' > /etc/timezone
 
 RUN mkdir -p $WORKER_HOME/config
 
 COPY *.jar $WORKER_HOME/
 COPY entrypoint.sh $WORKER_HOME/
 
+#EXPOSE 9971
+
 WORKDIR $WORKER_HOME
 
 RUN ls
 
 ENTRYPOINT ["sh","./entrypoint.sh"]
-

+ 2 - 2
doc/docker/calendar-center.yaml

@@ -35,9 +35,9 @@ spec:
         image: labisenlin.persagy.com/library/calendar-center:latest
         resources:
           limits:
-            memory: "2048Mi"
+            memory: "2560Mi"
           requests:
-            memory: "2048Mi"
+            memory: "2560Mi"
         ports: 
         - containerPort: 8080
           name: server-port