增加脚本参数校验，dockerfile镜像改为私有仓库镜像

增加脚本参数校验，dockerfile镜像改为私有仓库镜像

.gitignore

@@ -51,4 +51,7 @@ mvnw.cmd
 mvnw
 
 # Files or folders need to be retained
-# ...
+# ...
+/k8s/template-yaml/deploy/
+/k8s/dockerfiles/html/
+/k8s/dockerfiles/jar

k8s/build.sh

@@ -18,7 +18,7 @@ show_help() {
 }
 
 # 解析命令行选项
-while getopts "b:s:e:h" opt; do
+while getopts "b:s:h" opt; do
   case $opt in
     b) branch=$OPTARG ;;
     s) service=$OPTARG ;;
@@ -30,6 +30,12 @@ done
 echo "branch: $branch"
 echo "service: $service"
 
+valid_services=("manage-front" "manage" "front" "all")
+if [[ ! " ${valid_services[@]} " =~ " $service " ]]; then
+  echo "Invalid service name: $service" >&2
+  echo "Valid services are: ${valid_services[*]}"
+  exit 1
+fi
 
 # 登录到目标环境
 baseDir="/home/somuns/ci4s"

k8s/build_and_deploy.sh

@@ -36,6 +36,20 @@ while getopts "b:s:e:h" opt; do
   esac
 done
 
+valid_services=("manage-front" "manage" "front" "all")
+if [[ ! " ${valid_services[@]} " =~ " $service " ]]; then
+  echo "Invalid service name: $service" >&2
+  echo "Valid services are: ${valid_services[*]}"
+  exit 1
+fi
+
+valid_envs=("dev" "test")
+if [[ ! " ${valid_envs[@]} " =~ " $env " ]]; then
+  echo "Invalid environment: $env" >&2
+  echo "Valid environments are: ${valid_envs[*]}"
+  exit 1
+fi
+
 echo "start build"
 sh ${baseDir}/k8s/build.sh -b ${branch} -s ${service}
 if [ $? -ne 0 ]; then

k8s/deploy.sh

@@ -27,6 +27,20 @@ done
 
 echo "Deploy service: $service, environment: $env"
 
+valid_services=("manage-front" "manage" "front" "all")
+if [[ ! " ${valid_services[@]} " =~ " $service " ]]; then
+  echo "Invalid service name: $service" >&2
+  echo "Valid services are: ${valid_services[*]}"
+  exit 1
+fi
+
+valid_envs=("dev" "test")
+if [[ ! " ${valid_envs[@]} " =~ " $env " ]]; then
+  echo "Invalid environment: $env" >&2
+  echo "Valid environments are: ${valid_envs[*]}"
+  exit 1
+fi
+
 # 根据环境设置 IP 地址
 if [ "$env" == "dev" ]; then
   remote_ip="172.20.32.181"

k8s/dockerfiles/auth-dockerfile

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

k8s/dockerfiles/file-dockerfile

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

k8s/dockerfiles/gateway-dockerfile

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

k8s/dockerfiles/gen-dockerfile

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

k8s/dockerfiles/job-dockerfile

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

k8s/dockerfiles/managent-dockerfile

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

k8s/dockerfiles/nginx-dockerfile

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

k8s/dockerfiles/system-dockerfile

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

k8s/dockerfiles/visual-dockerfile

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