增加nacos配置

build/Dockerfile

@@ -17,17 +17,18 @@ WORKDIR /workspace
 COPY --from=builder /workspace/target/*.jar /workspace/app.jar
 
 ARG ENV_NAME
-ARG NACOS
+ARG NACOS_SERVER
+ARG NACOS_NAMESPACE
 ARG PORT
 
 ENV APP_OPTS1="-Dspring.profiles.active=${ENV_NAME}"
 ENV APP_OPTS2="-Djasypt.encryptor.password=1@wdLkj90#chMsdzxA%2024"
 ENV APP_OPTS3="-Dfile.encoding=utf-8"
 ENV APP_OPTS4="-Duser.timezone=Asia/Shanghai"
-ENV APP_OPTS5="${NACOS}"
+ENV APP_OPTS5="-DNACOS_SERVER=${NACOS_SERVER}"
+ENV APP_OPTS6="-DNACOS_NAMESPACE${NACOS_NAMESPACE}"
 ENV JVM_OPTS="-Xmx2024M -Xms256M"
 
-
 EXPOSE ${PORT}
 
-ENTRYPOINT ["sh","-c","java $APP_OPTS1 $APP_OPTS2 $APP_OPTS3 $APP_OPTS4 APP_OPTS5 -jar $JVM_OPTS /workspace/app.jar"]
+ENTRYPOINT ["sh","-c","java $APP_OPTS1 $APP_OPTS2 $APP_OPTS3 $APP_OPTS4 APP_OPTS5 APP_OPTS6 -jar $JVM_OPTS /workspace/app.jar"]
\ No newline at end of file

build/build.sh

@@ -44,7 +44,8 @@ function handle {
   echo "完整镜像: ${domain}/${namespace}/${name}:${version}"
 
   echo "---构建镜像---"
-  docker build --build-arg NACOS=${svc_nacos} --build-arg ENV_NAME=${svc_env} --build-arg PORT=${svc_port} -f ./build/Dockerfile -t ${domain}/${namespace}/${name}:${version} .
+  docker build --build-arg NACOS_SERVER=${nacos_server} --build-arg NACOS_NAMESPACE=${nacos_namespace} \
+  --build-arg ENV_NAME=${svc_env} --build-arg PORT=${svc_port} -f ./build/Dockerfile -t ${domain}/${namespace}/${name}:${version} .
 
   echo "---推送镜像---"
   docker login -u=$username -p=${passwd} ${domain}

build/env/env.prod

@@ -18,4 +18,5 @@ svc_name="think-tank"
 # 服务端口
 svc_port="9098"
 # nacos配置
-svc_nacos="-DNACOS_SERVER=192.168.0.249:9848 -DNACOS_NAMESPACE=smartTest"
+nacos_server="192.168.0.249:9848"
+nacos_namespace="smartTest"

build/env/env.test

@@ -18,4 +18,5 @@ svc_name="think-tank"
 # 服务端口
 svc_port="9099"
 # nacos配置
-svc_nacos="-DNACOS_SERVER=192.168.0.249:9848 -DNACOS_NAMESPACE=smartTest"
+nacos_server="192.168.0.249:9848"
+nacos_namespace="smartTest"