Merge remote-tracking branch 'origin/dev-czh' into dev
This commit is contained in:
commit
db7c0c77d9
|
@ -50,12 +50,14 @@ if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
git stash
|
||||||
git pull origin $branch
|
git pull origin $branch
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "拉取代码失败,请检查网络或联系管理员!"
|
echo "拉取代码失败,请检查网络或联系管理员!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
chmod +777 *.sh
|
||||||
# 创建目录
|
# 创建目录
|
||||||
mkdir -p ${baseDir}/k8s/dockerfiles/jar
|
mkdir -p ${baseDir}/k8s/dockerfiles/jar
|
||||||
mkdir -p ${baseDir}/k8s/dockerfiles/html
|
mkdir -p ${baseDir}/k8s/dockerfiles/html
|
||||||
|
|
Loading…
Reference in New Issue