提交 f1362f47 作者: panda

Merge remote-tracking branch 'origin/develop' into develop

FROM openjdk:8-jdk-alpine FROM openjdk:8-jdk-alpine
VOLUME ["/var/log/app/"]
ARG JAVA_OPTS ARG JAVA_OPTS
ENV JAVA_OPTS=$JAVA_OPTS ENV JAVA_OPTS=$JAVA_OPTS
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
......
...@@ -18,6 +18,9 @@ spec: ...@@ -18,6 +18,9 @@ spec:
containers: containers:
- name: oms - name: oms
image: REGISTRY/NAMESPACE/IMAGE:TAG image: REGISTRY/NAMESPACE/IMAGE:TAG
volumeMounts:
name: log-of-app
mountPath: /var/log/app
resources: resources:
limits: limits:
memory: 1024Mi memory: 1024Mi
...@@ -29,4 +32,8 @@ spec: ...@@ -29,4 +32,8 @@ spec:
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
name: oms-map name: oms-map
key: SPRING_PROFILES_ACTIVE key: SPRING_PROFILES_ACTIVE
\ No newline at end of file volumes:
- name: log-of-app
hostPath:
path: /var/log/app
\ No newline at end of file
...@@ -14,4 +14,4 @@ patches: ...@@ -14,4 +14,4 @@ patches:
images: images:
- name: REGISTRY/NAMESPACE/IMAGE:TAG - name: REGISTRY/NAMESPACE/IMAGE:TAG
newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/oms newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/oms
newTag: 80f3eed7d25441d96b0b38b5ad8bc831a3f23090 newTag: a48db7dc86741e9abbe66e43fefdfcadbb6f0b6d
...@@ -15,8 +15,12 @@ spring: ...@@ -15,8 +15,12 @@ spring:
jackson: jackson:
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8 time-zone: GMT+8
main:
banner-mode: off
logging: logging:
level: level:
com: com:
mmc: mmc:
oms: DEBUG oms: DEBUG
file:
name: "/var/log/app/${spring.application.name}.log"
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论