Merge pull request #9738 from ninjadq/fix_install_script

Fix install script
This commit is contained in:
Wang Yan 2019-11-06 14:24:07 +08:00 committed by GitHub
commit a9e8c6a430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -47,6 +47,13 @@ check_docker
h2 "[Step $item]: checking docker-compose is installed ..."; let item+=1 h2 "[Step $item]: checking docker-compose is installed ..."; let item+=1
check_dockercompose check_dockercompose
if [ -f harbor*.tar.gz ]
then
h2 "[Step $item]: loading Harbor images ..."; let item+=1
docker load -i ./harbor*.tar.gz
fi
echo ""
h2 "[Step $item]: preparing environment ..."; let item+=1 h2 "[Step $item]: preparing environment ..."; let item+=1
if [ -n "$host" ] if [ -n "$host" ]
then then
@ -71,13 +78,6 @@ fi
./prepare $prepare_para ./prepare $prepare_para
echo "" echo ""
if [ -f harbor*.tar.gz ]
then
h2 "[Step $item]: loading Harbor images ..."; let item+=1
docker load -i ./harbor*.tar.gz
fi
echo ""
if [ -n "$(docker-compose ps -q)" ] if [ -n "$(docker-compose ps -q)" ]
then then
note "stopping existing Harbor instance ..." note "stopping existing Harbor instance ..."