From ef972b7ab13d1394f1c9da5ca887d567524dc9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Mon, 27 Nov 2023 17:57:48 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20Dockerfile=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8shell=E6=A8=A1=E5=BC=8F=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E4=BC=A0=E5=85=A5jvm?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/Dockerfile | 15 +++++++-------- ruoyi-gateway/Dockerfile | 14 ++++++-------- ruoyi-modules/ruoyi-gen/Dockerfile | 4 ++-- ruoyi-modules/ruoyi-job/Dockerfile | 15 +++++++-------- ruoyi-modules/ruoyi-resource/Dockerfile | 15 +++++++-------- ruoyi-modules/ruoyi-system/Dockerfile | 15 +++++++-------- ruoyi-visual/ruoyi-monitor/Dockerfile | 6 +++--- ruoyi-visual/ruoyi-nacos/Dockerfile | 6 +++--- ruoyi-visual/ruoyi-powerjob-server/Dockerfile | 6 +++--- ruoyi-visual/ruoyi-seata-server/Dockerfile | 15 +++++++-------- ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile | 13 ++++++------- 11 files changed, 58 insertions(+), 66 deletions(-) diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile index 46cf17c4..f6721d21 100644 --- a/ruoyi-auth/Dockerfile +++ b/ruoyi-auth/Dockerfile @@ -9,16 +9,15 @@ RUN mkdir -p /ruoyi/auth/logs \ WORKDIR /ruoyi/auth -ENV SERVER_PORT=9210 LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV SERVER_PORT=9210 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} ADD ./target/ruoyi-auth.jar ./app.jar -ENTRYPOINT ["java", \ - "-Djava.security.egd=file:/dev/./urandom", \ - "-Dserver.port=${SERVER_PORT}", \ -# "-Dskywalking.agent.service_name=ruoyi-auth", \ -# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \ - "-jar", "app.jar", - "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"] +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ + #-Dskywalking.agent.service_name=ruoyi-auth \ + #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \ + -jar app.jar \ + -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS} + diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile index ef383801..ffaec9fa 100644 --- a/ruoyi-gateway/Dockerfile +++ b/ruoyi-gateway/Dockerfile @@ -9,16 +9,14 @@ RUN mkdir -p /ruoyi/gateway/logs \ WORKDIR /ruoyi/gateway -ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} ADD ./target/ruoyi-gateway.jar ./app.jar -ENTRYPOINT ["java", \ - "-Djava.security.egd=file:/dev/./urandom", \ - "-Dserver.port=${SERVER_PORT}", \ -# "-Dskywalking.agent.service_name=ruoyi-gateway", \ -# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \ - "-jar", "app.jar", - "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"] +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ + #-Dskywalking.agent.service_name=ruoyi-gateway \ + #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \ + -jar app.jar \ + -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS} diff --git a/ruoyi-modules/ruoyi-gen/Dockerfile b/ruoyi-modules/ruoyi-gen/Dockerfile index 6633de59..5b1f972e 100644 --- a/ruoyi-modules/ruoyi-gen/Dockerfile +++ b/ruoyi-modules/ruoyi-gen/Dockerfile @@ -7,10 +7,10 @@ RUN mkdir -p /ruoyi/gen/logs WORKDIR /ruoyi/gen -ENV SERVER_PORT=9202 LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV SERVER_PORT=9202 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} ADD ./target/ruoyi-gen.jar ./app.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dserver.port=${SERVER_PORT}", "-jar", "app.jar"] +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} -jar app.jar ${JAVA_OPTS} diff --git a/ruoyi-modules/ruoyi-job/Dockerfile b/ruoyi-modules/ruoyi-job/Dockerfile index e8c5fc60..2922d841 100644 --- a/ruoyi-modules/ruoyi-job/Dockerfile +++ b/ruoyi-modules/ruoyi-job/Dockerfile @@ -9,16 +9,15 @@ RUN mkdir -p /ruoyi/job/logs \ WORKDIR /ruoyi/job -ENV SERVER_PORT=9203 LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV SERVER_PORT=9203 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} ADD ./target/ruoyi-job.jar ./app.jar -ENTRYPOINT ["java", \ - "-Djava.security.egd=file:/dev/./urandom", \ - "-Dserver.port=${SERVER_PORT}", \ -# "-Dskywalking.agent.service_name=ruoyi-job", \ -# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \ - "-jar", "app.jar", - "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"] +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ + #-Dskywalking.agent.service_name=ruoyi-job \ + #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \ + -jar app.jar \ + -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS} + diff --git a/ruoyi-modules/ruoyi-resource/Dockerfile b/ruoyi-modules/ruoyi-resource/Dockerfile index 1dfd37f0..6e0df4f3 100644 --- a/ruoyi-modules/ruoyi-resource/Dockerfile +++ b/ruoyi-modules/ruoyi-resource/Dockerfile @@ -9,16 +9,15 @@ RUN mkdir -p /ruoyi/resource/logs \ WORKDIR /ruoyi/resource -ENV SERVER_PORT=9204 LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV SERVER_PORT=9204 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} ADD ./target/ruoyi-resource.jar ./app.jar -ENTRYPOINT ["java", \ - "-Djava.security.egd=file:/dev/./urandom", \ - "-Dserver.port=${SERVER_PORT}", \ -# "-Dskywalking.agent.service_name=ruoyi-resource", \ -# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \ - "-jar", "app.jar", - "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"] +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ + #-Dskywalking.agent.service_name=ruoyi-resource \ + #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \ + -jar app.jar \ + -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS} + diff --git a/ruoyi-modules/ruoyi-system/Dockerfile b/ruoyi-modules/ruoyi-system/Dockerfile index b3738b71..2989fbfc 100644 --- a/ruoyi-modules/ruoyi-system/Dockerfile +++ b/ruoyi-modules/ruoyi-system/Dockerfile @@ -9,16 +9,15 @@ RUN mkdir -p /ruoyi/system/logs \ WORKDIR /ruoyi/system -ENV SERVER_PORT=9201 LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV SERVER_PORT=9201 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} ADD ./target/ruoyi-system.jar ./app.jar -ENTRYPOINT ["java", \ - "-Djava.security.egd=file:/dev/./urandom", \ - "-Dserver.port=${SERVER_PORT}", \ -# "-Dskywalking.agent.service_name=ruoyi-system", \ -# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \ - "-jar", "app.jar", - "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"] +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ + #-Dskywalking.agent.service_name=ruoyi-system \ + #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \ + -jar app.jar \ + -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS} + diff --git a/ruoyi-visual/ruoyi-monitor/Dockerfile b/ruoyi-visual/ruoyi-monitor/Dockerfile index 20f84949..b335488e 100644 --- a/ruoyi-visual/ruoyi-monitor/Dockerfile +++ b/ruoyi-visual/ruoyi-monitor/Dockerfile @@ -7,11 +7,11 @@ RUN mkdir -p /ruoyi/monitor/logs WORKDIR /ruoyi/monitor -ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE 9100 ADD ./target/ruoyi-monitor.jar ./app.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar", - "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"] +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -jar app.jar \ + -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS} diff --git a/ruoyi-visual/ruoyi-nacos/Dockerfile b/ruoyi-visual/ruoyi-nacos/Dockerfile index 44752655..787c3bbc 100644 --- a/ruoyi-visual/ruoyi-nacos/Dockerfile +++ b/ruoyi-visual/ruoyi-nacos/Dockerfile @@ -9,10 +9,10 @@ WORKDIR /ruoyi/nacos EXPOSE 8848 -ENV TZ=Asia/Shanghai LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV TZ=Asia/Shanghai LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m" ADD ./target/ruoyi-nacos.jar ./app.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar", - "-Xms512m", "-Xmx1024m", "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"] +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -jar app.jar \ + -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS} diff --git a/ruoyi-visual/ruoyi-powerjob-server/Dockerfile b/ruoyi-visual/ruoyi-powerjob-server/Dockerfile index 9a4c03df..729bb222 100644 --- a/ruoyi-visual/ruoyi-powerjob-server/Dockerfile +++ b/ruoyi-visual/ruoyi-powerjob-server/Dockerfile @@ -7,11 +7,11 @@ RUN mkdir -p /ruoyi/powerjob/logs WORKDIR /ruoyi/powerjob -ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m" EXPOSE 7700 ADD ./target/ruoyi-powerjob-server.jar ./app.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar", - "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"] +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -jar app.jar \ + -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS} diff --git a/ruoyi-visual/ruoyi-seata-server/Dockerfile b/ruoyi-visual/ruoyi-seata-server/Dockerfile index 3116e770..0487c6ca 100644 --- a/ruoyi-visual/ruoyi-seata-server/Dockerfile +++ b/ruoyi-visual/ruoyi-seata-server/Dockerfile @@ -8,7 +8,7 @@ RUN mkdir -p /ruoyi/seata-server/logs \ WORKDIR /ruoyi/seata-server -ENV TZ=PRC LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV TZ=PRC LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone EXPOSE 7091 @@ -16,10 +16,9 @@ EXPOSE 8091 ADD ./target/ruoyi-seata-server.jar ./app.jar -ENTRYPOINT ["java", \ - "-Djava.security.egd=file:/dev/./urandom", \ -# "-Dskywalking.agent.service_name=ruoyi-seata-server", \ -# "-Dskywalking.plugin.seata.server=true", \ -# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \ - "-jar", "app.jar", - "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"] +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \ + #-Dskywalking.agent.service_name=ruoyi-seata-server", \ + #-Dskywalking.plugin.seata.server=true", \ + #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \ + -jar app.jar \ + -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS} diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile b/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile index b1195aa5..2c00d781 100644 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile +++ b/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile @@ -8,15 +8,14 @@ RUN mkdir -p /ruoyi/sentinel-dashboard/logs \ WORKDIR /ruoyi/sentinel-dashboard -ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE 8718 ADD ./target/ruoyi-sentinel-dashboard.jar ./app.jar -ENTRYPOINT ["java", \ - "-Djava.security.egd=file:/dev/./urandom", \ -# "-Dskywalking.agent.service_name=ruoyi-sentinel-dashboard", \ -# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \ - "-jar", "app.jar", - "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"] +ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ + #-Dskywalking.agent.service_name=ruoyi-sentinel-dashboard \ + #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \ + -jar app.jar \ + -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS}