diff --git a/make/install.sh b/make/install.sh index 45d5e6448..c06a1220d 100755 --- a/make/install.sh +++ b/make/install.sh @@ -47,6 +47,13 @@ check_docker h2 "[Step $item]: checking docker-compose is installed ..."; let item+=1 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 if [ -n "$host" ] then @@ -71,13 +78,6 @@ fi ./prepare $prepare_para 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)" ] then note "stopping existing Harbor instance ..."