Commit ca0334bf authored by 李灿灿's avatar 李灿灿

Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request !270
parents 80081157 8c429517
...@@ -63,7 +63,7 @@ spec: # 资源规范字段 ...@@ -63,7 +63,7 @@ spec: # 资源规范字段
#cpu: 300m # CPU,1核心 = 1000m #cpu: 300m # CPU,1核心 = 1000m
requests: # 容器运行时,最低资源需求,也就是说最少需要多少资源容器才能正常运行 requests: # 容器运行时,最低资源需求,也就是说最少需要多少资源容器才能正常运行
#cpu: 100m #cpu: 100m
memory: "2048Mi" memory: "500Mi"
#livenessProbe: # pod 内部健康检查的设置 #livenessProbe: # pod 内部健康检查的设置
# httpGet: # 通过httpget检查健康,返回200-399之间,则认为容器正常 # httpGet: # 通过httpget检查健康,返回200-399之间,则认为容器正常
# path: /healthCheck # URI地址 # path: /healthCheck # URI地址
......
...@@ -10,6 +10,6 @@ COPY ${JAR_FILE} app.jar ...@@ -10,6 +10,6 @@ COPY ${JAR_FILE} app.jar
EXPOSE 5002 EXPOSE 5002
ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx512m -Djava.security.egd=file:/dev/./urandom"
CMD sleep 60; java -jar app.jar $JAVA_OPTS CMD sleep 60; java -jar app.jar $JAVA_OPTS
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment