From c3709944af5d880c39270ac05fbfa47fe7cf8fbd Mon Sep 17 00:00:00 2001 From: Daniel Valenzuela Date: Sat, 17 Feb 2024 01:03:43 -0300 Subject: [PATCH] fix: mongosh in provision.sh --- provision.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/provision.sh b/provision.sh index 2f638c87924..626a8f67e0e 100755 --- a/provision.sh +++ b/provision.sh @@ -160,21 +160,25 @@ if needs_mongo "$to_provision_ordered"; then echo -e "${GREEN}Waiting for MongoDB...${NC}" # mongo container and mongo process/shell inside the container MONGO_SHELL=$(docker-compose exec -T mongo which mongosh) - if [[ $MONGO_SHELL ]] then + if [ -z "$MONGO_SHELL" ]; then until docker-compose exec -T mongo mongosh --eval "db.serverStatus()" &> /dev/null + do + printf "." + sleep 1 + done else until docker-compose exec -T mongo mongo --eval "db.serverStatus()" &> /dev/null + do + printf "." + sleep 1 + done fi -t do - printf "." - sleep 1 - done echo -e "${GREEN}MongoDB ready.${NC}" echo -e "${GREEN}Creating MongoDB users...${NC}" - if [[ $MONGO_SHELL ]] then - docker-compose exec -T mongo bash -e -c "mongosh" < mongo-provision.js + if [ -z $MONGO_SHELL ] then + docker-compose exec -T mongo bash -e -c "mongosh" < mongo-provision.js; else - docker-compose exec -T mongo bash -e -c "mongo" < mongo-provision.js + docker-compose exec -T mongo bash -e -c "mongo" < mongo-provision.js; fi else echo -e "${GREEN}MongoDB preparation not required; skipping.${NC}"