From 2e1eb627331f5efd38033bcd96bf6997a2a7cbd6 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: Wed, 8 May 2024 18:09:53 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4gc=E6=97=A5=E5=BF=97=E5=8F=82=E6=95=B0(=E6=9C=89?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=87=AA=E5=B7=B1=E5=8A=A0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-auth/Dockerfile                            | 4 ++--
 ruoyi-gateway/Dockerfile                         | 4 ++--
 ruoyi-modules/ruoyi-gen/Dockerfile               | 2 +-
 ruoyi-modules/ruoyi-job/Dockerfile               | 4 ++--
 ruoyi-modules/ruoyi-resource/Dockerfile          | 4 ++--
 ruoyi-modules/ruoyi-system/Dockerfile            | 4 ++--
 ruoyi-visual/ruoyi-easyretry-server/Dockerfile   | 5 +++--
 ruoyi-visual/ruoyi-monitor/Dockerfile            | 5 +++--
 ruoyi-visual/ruoyi-nacos/Dockerfile              | 2 +-
 ruoyi-visual/ruoyi-powerjob-server/Dockerfile    | 2 +-
 ruoyi-visual/ruoyi-seata-server/Dockerfile       | 2 +-
 ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile | 2 +-
 12 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile
index f6721d215..406bb65d9 100644
--- a/ruoyi-auth/Dockerfile
+++ b/ruoyi-auth/Dockerfile
@@ -18,6 +18,6 @@ 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 ${JAVA_OPTS}
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
+           -jar app.jar
 
diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile
index ffaec9fa8..a0b24dbff 100644
--- a/ruoyi-gateway/Dockerfile
+++ b/ruoyi-gateway/Dockerfile
@@ -18,5 +18,5 @@ 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 ${JAVA_OPTS}
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
+           -jar app.jar
diff --git a/ruoyi-modules/ruoyi-gen/Dockerfile b/ruoyi-modules/ruoyi-gen/Dockerfile
index 5b1f972e5..5e7dab3f5 100644
--- a/ruoyi-modules/ruoyi-gen/Dockerfile
+++ b/ruoyi-modules/ruoyi-gen/Dockerfile
@@ -13,4 +13,4 @@ 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 ${JAVA_OPTS}
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} ${JAVA_OPTS} -jar app.jar
diff --git a/ruoyi-modules/ruoyi-job/Dockerfile b/ruoyi-modules/ruoyi-job/Dockerfile
index 2922d8411..2f182dda8 100644
--- a/ruoyi-modules/ruoyi-job/Dockerfile
+++ b/ruoyi-modules/ruoyi-job/Dockerfile
@@ -18,6 +18,6 @@ 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 ${JAVA_OPTS}
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
+           -jar app.jar
 
diff --git a/ruoyi-modules/ruoyi-resource/Dockerfile b/ruoyi-modules/ruoyi-resource/Dockerfile
index 6e0df4f3f..78569b9db 100644
--- a/ruoyi-modules/ruoyi-resource/Dockerfile
+++ b/ruoyi-modules/ruoyi-resource/Dockerfile
@@ -18,6 +18,6 @@ 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 ${JAVA_OPTS}
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
+           -jar app.jar
 
diff --git a/ruoyi-modules/ruoyi-system/Dockerfile b/ruoyi-modules/ruoyi-system/Dockerfile
index 2989fbfc5..1984ac3ca 100644
--- a/ruoyi-modules/ruoyi-system/Dockerfile
+++ b/ruoyi-modules/ruoyi-system/Dockerfile
@@ -18,6 +18,6 @@ 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 ${JAVA_OPTS}
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
+           -jar app.jar
 
diff --git a/ruoyi-visual/ruoyi-easyretry-server/Dockerfile b/ruoyi-visual/ruoyi-easyretry-server/Dockerfile
index 7ad0a0776..6fe5f0bf5 100644
--- a/ruoyi-visual/ruoyi-easyretry-server/Dockerfile
+++ b/ruoyi-visual/ruoyi-easyretry-server/Dockerfile
@@ -14,5 +14,6 @@ EXPOSE 1788
 
 ADD ./target/ruoyi-easyretry-server.jar ./app.jar
 
-ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -jar app.jar \
-           -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS}
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
+           -jar app.jar
diff --git a/ruoyi-visual/ruoyi-monitor/Dockerfile b/ruoyi-visual/ruoyi-monitor/Dockerfile
index b335488ea..ad8f77f62 100644
--- a/ruoyi-visual/ruoyi-monitor/Dockerfile
+++ b/ruoyi-visual/ruoyi-monitor/Dockerfile
@@ -13,5 +13,6 @@ 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 ${JAVA_OPTS}
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
+           -jar app.jar
diff --git a/ruoyi-visual/ruoyi-nacos/Dockerfile b/ruoyi-visual/ruoyi-nacos/Dockerfile
index 6394b7b3d..630b9bb9a 100644
--- a/ruoyi-visual/ruoyi-nacos/Dockerfile
+++ b/ruoyi-visual/ruoyi-nacos/Dockerfile
@@ -13,5 +13,5 @@ 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 ${JAVA_OPTS}
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom ${JAVA_OPTS} -jar app.jar
 
diff --git a/ruoyi-visual/ruoyi-powerjob-server/Dockerfile b/ruoyi-visual/ruoyi-powerjob-server/Dockerfile
index 729bb2223..4423c7ce3 100644
--- a/ruoyi-visual/ruoyi-powerjob-server/Dockerfile
+++ b/ruoyi-visual/ruoyi-powerjob-server/Dockerfile
@@ -14,4 +14,4 @@ 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 ${JAVA_OPTS}
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS}
diff --git a/ruoyi-visual/ruoyi-seata-server/Dockerfile b/ruoyi-visual/ruoyi-seata-server/Dockerfile
index 0aea120be..a981b105f 100644
--- a/ruoyi-visual/ruoyi-seata-server/Dockerfile
+++ b/ruoyi-visual/ruoyi-seata-server/Dockerfile
@@ -20,4 +20,4 @@ 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 ${JAVA_OPTS}
+           ${JAVA_OPTS} -jar app.jar
diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile b/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile
index ef50b9063..fe925d90d 100644
--- a/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile
+++ b/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile
@@ -17,4 +17,4 @@ 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 ${JAVA_OPTS}
+           ${JAVA_OPTS} -jar app.jar