修改部署文件部署华为云

k8s/build-java.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-baseDir="/home/somuns/ci4s"
+baseDir="/data/code"
 
 
 #判断$1是否为all，如果是，则编译所有模块，否则只编译management-platform模块

k8s/build-node.sh

@@ -1,11 +1,9 @@
 #!/bin/bash
 
-baseDir="/home/somuns/ci4s"
+baseDir="/data/code"
 cd ${baseDir}/react-ui
 
 npm config set registry https://registry.npmmirror.com/
-npm config set proxy http://172.20.32.253:3128
-npm config set https-proxy http://172.20.32.253:3128
 
 npm install --force
 

k8s/build.sh

@@ -38,7 +38,7 @@ if [[ ! " ${valid_services[@]} " =~ " $service " ]]; then
 fi
 
 # 登录到目标环境
-baseDir="/home/somuns/ci4s"
+baseDir="/data/code"
 cd ${baseDir}
 
 # 拉取指定分支的最新代码
@@ -72,8 +72,7 @@ compile_front() {
 
     # 编译前端
     docker run -v ${baseDir}:${baseDir} \
-      -e http_proxy=http://172.20.32.253:3128 -e https_proxy=http://172.20.32.253:3128 \
-      172.20.32.187/ci4s/node:16.16.0 ${baseDir}/k8s/build-node.sh
+      node:16.16.0 ${baseDir}/k8s/build-node.sh
     if [ $? -ne 0 ]; then
         echo "编译失败，请检查代码！"
         exit 1
@@ -90,9 +89,8 @@ compile_front() {
 compile_java() {
   param=$1
     # 编译java
-  docker run -v ${baseDir}:${baseDir} -v /home/maven:/home/maven \
-    -e http_proxy=http://172.20.32.253:3128 -e https_proxy=http://172.20.32.253:3128 \
-    172.20.32.187/ci4s/build:v3 ${baseDir}/k8s/build-java.sh $param
+  docker run -v ${baseDir}:${baseDir} -v /home/maven:/root/.m2/repository \
+    maven:3.9 ${baseDir}/k8s/build-java.sh $param
   if [ $? -ne 0 ]; then
       echo "编译失败，请检查代码！"
       exit 1

k8s/build_and_deploy.sh

@@ -4,7 +4,7 @@
 startTime=$(date +%s)
 
 # 登录到目标环境
-baseDir="/home/somuns/ci4s"
+baseDir="/data/code"
 cd ${baseDir}
 
 

k8s/dockerfiles/auth-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  openjdk:8-jre
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM  openjdk:8-jre
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/file-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
-#FROM  openjdk:8-jre
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM  openjdk:8-jre
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/gateway-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  openjdk:8-jre
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM  openjdk:8-jre
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/gen-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  openjdk:8-jre
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM  openjdk:8-jre
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/job-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  openjdk:8-jre
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM  openjdk:8-jre
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/managent-dockerfile

@@ -1,6 +1,7 @@
 # 基础镜像
+FROM  openjdk:8-jre
 #FROM  172.20.32.187/ci4s/openjdk:8u162
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/nginx-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM nginx:latest
-FROM 172.20.32.187/ci4s/nginx:latest
+FROM nginx:latest
+#FROM 172.20.32.187/ci4s/nginx:latest
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/system-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  openjdk:8-jre
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM  openjdk:8-jre
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi
 

k8s/dockerfiles/visual-dockerfile

@@ -1,6 +1,6 @@
 # 基础镜像
-#FROM  openjdk:8-jre
-FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
+FROM  openjdk:8-jre
+#FROM 172.20.32.187/ci4s/openjdk-dvc:2024829
 # author
 MAINTAINER ruoyi