diff --git a/builder/Dockerfile b/builder/Dockerfile index b9e62da..e3cb71b 100644 --- a/builder/Dockerfile +++ b/builder/Dockerfile @@ -4,7 +4,7 @@ FROM registry.t-aaron.com/tuoheng/centos:base USER th # 定义构建参数 # ARG SW_APP_NAME -# ARG SW_SKY_AOP +# ARG SW_AGENT_COLLECTOR_BACKEND_SERVICES # 设置工作目录 WORKDIR /data/java/tuoheng COPY apache-skywalking-java-agent-9.0.0.tgz . @@ -13,8 +13,8 @@ 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_SKY_AOP}" \ +# SW_AGENT_NAME="${SW_APP_NAME}" #暴露应用程序的端口 #EXPOSE 8090 # 运行应用程序 @@ -27,7 +27,7 @@ ENV PATH="/usr/java/jdk/bin:${PATH}" ENTRYPOINT exec java -Dfile.encoding=UTF-8 \ -javaagent:/data/java/tuoheng/skywalking-agent/skywalking-agent.jar \ --Dskywalking.agent.service_name=${SW_AGENT_NAME} \ +-Dskywalking.agent.service_name=${SW_APP_NAME} \ -Dskywalking.collector.backend_service=${SW_AGENT_COLLECTOR_BACKEND_SERVICES} \ --Dskywalking.agent.instance_name=${SW_AGENT_NAME} \ +-Dskywalking.agent.instance_name=${SW_APP_NAME} \ -jar tuoheng.jar \ No newline at end of file diff --git a/builder/builder.sh b/builder/builder.sh index b6613b9..ddee83c 100755 --- a/builder/builder.sh +++ b/builder/builder.sh @@ -17,7 +17,6 @@ cp /data/java/apache-skywalking-java-agent-9.0.0.tgz apache-skywalking-java-agen docker image rm $2 docker build --no-cache \ --build-arg SW_APP_NAME=$1 \ - --build-arg SW_SKY_AOP=${SKYWALKING_OAP_NAME}:11800 \ --build-arg SW_AGENT_COLLECTOR_BACKEND_SERVICES=${SKYWALKING_OAP_NAME}:11800 \ -t $2 . # 注意末尾的 `.` 表示当前路径 docker push $2 \ No newline at end of file