From e32035711d1d8d10fafc252202f677706ec10991 Mon Sep 17 00:00:00 2001 From: somunslotus Date: Thu, 13 Jun 2024 10:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E4=BF=AE=E6=94=B9dockerhub=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E4=B8=BA=E7=A7=81=E6=9C=89=E4=BB=93=E5=BA=93=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 ++++- k8s/build.sh | 8 +++++++- k8s/build_and_deploy.sh | 14 ++++++++++++++ k8s/deploy.sh | 14 ++++++++++++++ k8s/dockerfiles/auth-dockerfile | 3 ++- k8s/dockerfiles/file-dockerfile | 3 ++- k8s/dockerfiles/gateway-dockerfile | 3 ++- k8s/dockerfiles/gen-dockerfile | 3 ++- k8s/dockerfiles/job-dockerfile | 3 ++- k8s/dockerfiles/managent-dockerfile | 3 ++- k8s/dockerfiles/nginx-dockerfile | 3 ++- k8s/dockerfiles/system-dockerfile | 3 ++- k8s/dockerfiles/visual-dockerfile | 3 ++- 13 files changed, 57 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 0203dc65..0014ee8f 100644 --- a/.gitignore +++ b/.gitignore @@ -51,4 +51,7 @@ mvnw.cmd mvnw # Files or folders need to be retained -# ... \ No newline at end of file +# ... +/k8s/template-yaml/deploy/ +/k8s/dockerfiles/html/ +/k8s/dockerfiles/jar diff --git a/k8s/build.sh b/k8s/build.sh index 31c9d8a0..c9d46265 100644 --- a/k8s/build.sh +++ b/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" diff --git a/k8s/build_and_deploy.sh b/k8s/build_and_deploy.sh index 0f7ebbcb..eacc9c6b 100644 --- a/k8s/build_and_deploy.sh +++ b/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 diff --git a/k8s/deploy.sh b/k8s/deploy.sh index c9d296f9..a9fe57f8 100644 --- a/k8s/deploy.sh +++ b/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" diff --git a/k8s/dockerfiles/auth-dockerfile b/k8s/dockerfiles/auth-dockerfile index 40c54603..0eb3dc52 100644 --- a/k8s/dockerfiles/auth-dockerfile +++ b/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 diff --git a/k8s/dockerfiles/file-dockerfile b/k8s/dockerfiles/file-dockerfile index 0d6e0258..d5a2b843 100644 --- a/k8s/dockerfiles/file-dockerfile +++ b/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 diff --git a/k8s/dockerfiles/gateway-dockerfile b/k8s/dockerfiles/gateway-dockerfile index 6082ce2d..4ce7ee42 100644 --- a/k8s/dockerfiles/gateway-dockerfile +++ b/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 diff --git a/k8s/dockerfiles/gen-dockerfile b/k8s/dockerfiles/gen-dockerfile index 0693b1d7..8c871a89 100644 --- a/k8s/dockerfiles/gen-dockerfile +++ b/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 diff --git a/k8s/dockerfiles/job-dockerfile b/k8s/dockerfiles/job-dockerfile index 028a6526..dca8596c 100644 --- a/k8s/dockerfiles/job-dockerfile +++ b/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 diff --git a/k8s/dockerfiles/managent-dockerfile b/k8s/dockerfiles/managent-dockerfile index 9df2566d..c4a1b85f 100644 --- a/k8s/dockerfiles/managent-dockerfile +++ b/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 diff --git a/k8s/dockerfiles/nginx-dockerfile b/k8s/dockerfiles/nginx-dockerfile index 378afcac..42e9891a 100644 --- a/k8s/dockerfiles/nginx-dockerfile +++ b/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 diff --git a/k8s/dockerfiles/system-dockerfile b/k8s/dockerfiles/system-dockerfile index f57952b0..f01b3c34 100644 --- a/k8s/dockerfiles/system-dockerfile +++ b/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 diff --git a/k8s/dockerfiles/visual-dockerfile b/k8s/dockerfiles/visual-dockerfile index 3549bacc..34ba71b9 100644 --- a/k8s/dockerfiles/visual-dockerfile +++ b/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