diff --git a/Dockerfile b/Dockerfile index 98717d8..7265a08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,4 +7,4 @@ WORKDIR /app # 复制 jar 包 COPY target/*.jar app.jar # 设置 JVM 参数和启动命令 -ENTRYPOINT ["java", "-jar", "-Xms128m", "-Xmx256m", "app.jar"] \ No newline at end of file +ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar app.jar"] \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index aff7c68..e16b415 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,6 +60,7 @@ pipeline { --network sczx-net \ -p 8083:8083 \ -e SPRING_PROFILES_ACTIVE=test \ + -e NACOS_SERVER_ADDR=115.190.8.52:8848 \\ # 测试环境 Nacos 地址 -e JAVA_OPTS="-Xms256m -Xmx512m -Duser.timezone=Asia/Shanghai" \ -e TZ=Asia/Shanghai \ -v /etc/localtime:/etc/localtime:ro \ diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index cb2dc9e..c806a01 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -3,7 +3,7 @@ spring: name: sczx-car # 应用名称,对应 Nacos 配置的 dataId cloud: nacos: - server-addr: 115.190.8.52:8848 # Nacos 服务器地址 + server-addr: ${NACOS_SERVER_ADDR:115.190.8.52:8848} # Nacos 服务器地址 config: group: DEFAULT_GROUP # 配置分组 file-extension: yaml # 配置文件格式