From c4032aae88a079d8bb1198723d88c6e72935516b Mon Sep 17 00:00:00 2001
From: bleachtred <bleachtred@163.com>
Date: 星期二, 04 七月 2023 17:59:28 +0800
Subject: [PATCH] fix 修复相同字段mapstruct会自动赋值问题
---
ruoyi-admin/Dockerfile | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile
index f792e6f..0996e40 100644
--- a/ruoyi-admin/Dockerfile
+++ b/ruoyi-admin/Dockerfile
@@ -1,9 +1,10 @@
-FROM anapsix/alpine-java:8_server-jre_unlimited
+FROM findepi/graalvm:java17-native
MAINTAINER Lion Li
RUN mkdir -p /ruoyi/server/logs \
- /ruoyi/server/temp
+ /ruoyi/server/temp \
+ /ruoyi/skywalking/agent
WORKDIR /ruoyi/server
@@ -13,4 +14,10 @@
ADD ./target/ruoyi-admin.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}", \
+ # 搴旂敤鍚嶇О 濡傛灉鎯冲尯鍒嗛泦缇よ妭鐐圭洃鎺� 鏀规垚涓嶅悓鐨勫悕绉板嵆鍙�
+# "-Dskywalking.agent.service_name=ruoyi-server", \
+# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \
+ "-jar", "app.jar"]
--
Gitblit v1.9.3