增加参数校验,修改dockerhub镜像为私有仓库镜像
This commit is contained in:
parent
0af15f819c
commit
e32035711d
|
@ -52,3 +52,6 @@ mvnw
|
|||
|
||||
# Files or folders need to be retained
|
||||
# ...
|
||||
/k8s/template-yaml/deploy/
|
||||
/k8s/dockerfiles/html/
|
||||
/k8s/dockerfiles/jar
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# 基础镜像
|
||||
FROM openjdk:8-jre
|
||||
#FROM openjdk:8-jre
|
||||
FROM 172.20.32.187/ci4s/openjdk:8-jre
|
||||
# author
|
||||
MAINTAINER ruoyi
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# 基础镜像
|
||||
FROM openjdk:8-jre
|
||||
FROM 172.20.32.187/ci4s/openjdk:8-jre
|
||||
#FROM openjdk:8-jre
|
||||
# author
|
||||
MAINTAINER ruoyi
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# 基础镜像
|
||||
FROM openjdk:8-jre
|
||||
#FROM openjdk:8-jre
|
||||
FROM 172.20.32.187/ci4s/openjdk:8-jre
|
||||
# author
|
||||
MAINTAINER ruoyi
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# 基础镜像
|
||||
FROM openjdk:8-jre
|
||||
#FROM openjdk:8-jre
|
||||
FROM 172.20.32.187/ci4s/openjdk:8-jre
|
||||
# author
|
||||
MAINTAINER ruoyi
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# 基础镜像
|
||||
FROM openjdk:8-jre
|
||||
#FROM openjdk:8-jre
|
||||
FROM 172.20.32.187/ci4s/openjdk:8-jre
|
||||
# author
|
||||
MAINTAINER ruoyi
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# 基础镜像
|
||||
FROM openjdk:8-jre
|
||||
#FROM openjdk:8-jre
|
||||
FROM 172.20.32.187/ci4s/openjdk:8-jre
|
||||
# author
|
||||
MAINTAINER ruoyi
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# 基础镜像
|
||||
FROM nginx:latest
|
||||
#FROM nginx:latest
|
||||
FROM 172.20.32.187/ci4s/nginx:latest
|
||||
# author
|
||||
MAINTAINER ruoyi
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# 基础镜像
|
||||
FROM openjdk:8-jre
|
||||
#FROM openjdk:8-jre
|
||||
FROM 172.20.32.187/ci4s/openjdk:8-jre
|
||||
# author
|
||||
MAINTAINER ruoyi
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# 基础镜像
|
||||
FROM openjdk:8-jre
|
||||
#FROM openjdk:8-jre
|
||||
FROM 172.20.32.187/ci4s/openjdk:8-jre
|
||||
# author
|
||||
MAINTAINER ruoyi
|
||||
|
||||
|
|
Loading…
Reference in New Issue