From 65079341711aaeeab111b8f0f7235166dbc3e8ec Mon Sep 17 00:00:00 2001 From: Aarif Date: Fri, 30 Oct 2020 00:11:27 +0500 Subject: [PATCH] updated docker command for mongodb container's db status --- provision.sh | 3 ++- upgrade_mongo_3_6.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/provision.sh b/provision.sh index 731d58958c..5aeb87534a 100755 --- a/provision.sh +++ b/provision.sh @@ -167,7 +167,8 @@ docker-compose exec -T mysql57 bash -c "mysql -uroot mysql" < provision.sql # and create its users. if needs_mongo "$to_provision_ordered"; then echo -e "${GREEN}Waiting for MongoDB...${NC}" - until docker-compose exec -T mongo bash -c 'mongo --eval "printjson(db.serverStatus())"' &> /dev/null + # mongo container and mongo process/shell inside the container + until docker-compose exec -T mongo mongo --eval "db.serverStatus()" &> /dev/null do printf "." sleep 1 diff --git a/upgrade_mongo_3_6.sh b/upgrade_mongo_3_6.sh index 3644a8c7c9..eb7708c0aa 100755 --- a/upgrade_mongo_3_6.sh +++ b/upgrade_mongo_3_6.sh @@ -14,7 +14,7 @@ make dev.up.mongo mongo_container="$(make -s dev.print-container.mongo)" echo -e "${GREEN}Waiting for MongoDB...${NC}" -until docker exec "$mongo_container" bash -c 'mongo --eval \"printjson(db.serverStatus())\"' &> /dev/null +until docker exec "$mongo_container" mongo --eval 'db.serverStatus()' &> /dev/null do if docker logs "$mongo_container" | grep -q "BadValue: Invalid value for version, found 3.6, expected '3.4' or '3.2'"; then echo -e "${YELLOW}Already upgraded to Mongo 3.6, exiting${NC}" @@ -47,7 +47,7 @@ make dev.up.mongo mongo_container="$(make -s dev.print-container.mongo)" echo -e "${GREEN}Waiting for MongoDB...${NC}" -until docker exec "$mongo_container" bash -c 'mongo --eval \"printjson(db.serverStatus())\"' &> /dev/null +until docker exec "$mongo_container" mongo --eval 'db.serverStatus()' &> /dev/null do printf "." sleep 1