From 69b8a3cfec67b1a54698b4144fa7952edcf1022a Mon Sep 17 00:00:00 2001
From: Michelle.Chung <1242874891@qq.com>
Date: 星期日, 05 二月 2023 09:02:18 +0800
Subject: [PATCH] fix vm 修正 controller.java.vm 代码生成模板包路径错误 ;

---
 ruoyi-admin/Dockerfile |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile
index dc484c5..aebab8c 100644
--- a/ruoyi-admin/Dockerfile
+++ b/ruoyi-admin/Dockerfile
@@ -1,15 +1,23 @@
-FROM anapsix/alpine-java:8_server-jre_unlimited
+FROM ghcr.io/graalvm/jdk:ol8-java17-22.3.0
 
 MAINTAINER Lion Li
 
-RUN mkdir -p /ruoyi/server
-RUN mkdir -p /ruoyi/server/logs
-RUN mkdir -p /ruoyi/server/ruoyi/uploadPath
+RUN mkdir -p /ruoyi/server/logs \
+    /ruoyi/server/temp \
+    /ruoyi/skywalking/agent
 
 WORKDIR /ruoyi/server
 
-EXPOSE 8080
+ENV SERVER_PORT=8080
+
+EXPOSE ${SERVER_PORT}
 
 ADD ./target/ruoyi-admin.jar ./app.jar
 
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-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