Merge branch 'dev-v2' into pr@dev-v2_export_data

This commit is contained in:
taojinlong
2024-05-27 19:13:07 +08:00
27 changed files with 193 additions and 85 deletions

View File

@@ -1,4 +1,4 @@
FROM registry.cn-qingdao.aliyuncs.com/dataease/alpine-openjdk17-jre
FROM registry.cn-qingdao.aliyuncs.com/dataease/alpine-openjdk21-jre
RUN mkdir -p /opt/apps/config /opt/dataease2.0/drivers/ /opt/dataease2.0/cache/ /opt/dataease2.0/data/map /opt/dataease2.0/data/static-resource/ /opt/dataease2.0/data/appearance/ /opt/dataease2.0/data/exportData/
@@ -11,8 +11,9 @@ WORKDIR /opt/apps
ADD core/core-backend/target/CoreApplication.jar /opt/apps/app.jar
ENV JAVA_APP_JAR=/opt/apps/app.jar
ENV RUNNING_PORT=8100
ENV JAVA_OPTIONS="-Dfile.encoding=utf-8 -Dloader.path=/opt/apps -Dspring.config.additional-location=/opt/apps/config/"
HEALTHCHECK --interval=15s --timeout=5s --retries=20 --start-period=30s CMD nc -zv 127.0.0.1 8100
HEALTHCHECK --interval=15s --timeout=5s --retries=20 --start-period=30s CMD nc -zv 127.0.0.1 $RUNNING_PORT
CMD ["/deployments/run-java.sh"]