From abfd50872cfbaaa2db5df7f1538a2f771114933e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Fri, 13 Jun 2025 09:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 builder/Dockerfile | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/builder/Dockerfile b/builder/Dockerfile
index e3cb71b..8af0a5a 100644
--- a/builder/Dockerfile
+++ b/builder/Dockerfile
@@ -3,8 +3,8 @@
 FROM registry.t-aaron.com/tuoheng/centos:base
 USER th
 # 定义构建参数
-# ARG SW_APP_NAME
-# ARG SW_AGENT_COLLECTOR_BACKEND_SERVICES
+ARG SW_APP_NAME
+ARG SW_AGENT_COLLECTOR_BACKEND_SERVICES
 # 设置工作目录
 WORKDIR /data/java/tuoheng
 COPY apache-skywalking-java-agent-9.0.0.tgz  .
@@ -13,21 +13,14 @@ RUN  tar -zxvf apache-skywalking-java-agent-9.0.0.tgz
 COPY tuoheng.jar .
 # 设置环境变量
 ENV PATH="/usr/java/jdk/bin:${PATH}"
-#ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="${SW_SKY_AOP}" \
-#    SW_AGENT_NAME="${SW_APP_NAME}"
+ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES="${SW_AGENT_COLLECTOR_BACKEND_SERVICES}" \
+    SW_AGENT_NAME="${SW_APP_NAME}"
 #暴露应用程序的端口
 #EXPOSE 8090
 # 运行应用程序
-# ENTRYPOINT ["java", "-Dfile.encoding=UTF-8", \
-#     "-javaagent:/data/java/tuoheng/skywalking-agent/skywalking-agent.jar", \
-#     "-Dskywalking.agent.service_name=${SW_APP_NAME}", \
-#     "-Dskywalking.collector.backend_service=${SW_SKY_AOP}", \
-#     "-Dskywalking.agent.instance_name=${SW_APP_NAME}", \
-#     "-jar", "tuoheng.jar"]
-                                    
-ENTRYPOINT exec java -Dfile.encoding=UTF-8 \
--javaagent:/data/java/tuoheng/skywalking-agent/skywalking-agent.jar \
--Dskywalking.agent.service_name=${SW_APP_NAME} \
--Dskywalking.collector.backend_service=${SW_AGENT_COLLECTOR_BACKEND_SERVICES} \
--Dskywalking.agent.instance_name=${SW_APP_NAME} \
--jar tuoheng.jar   
\ No newline at end of file
+ENTRYPOINT ["java", "-Dfile.encoding=UTF-8", \
+    "-javaagent:/data/java/tuoheng/skywalking-agent/skywalking-agent.jar", \
+    "-Dskywalking.agent.service_name=${SW_APP_NAME}", \
+    "-Dskywalking.collector.backend_service=${SW_AGENT_COLLECTOR_BACKEND_SERVICES}", \
+    "-Dskywalking.agent.instance_name=${SW_APP_NAME}", \
+    "-jar", "tuoheng.jar"]