Merge a7b2730f2b into 40afbf64d6

mongo/Dockerfile.4.4

@@ -1,4 +1,4 @@
-FROM mongo
+FROM mongo:4.4
 
 COPY docker-healthcheck /usr/local/bin/
 

mongo/Dockerfile.5.0

@@ -0,0 +1,5 @@
+FROM mongo:5.0
+
+COPY docker-healthcheck /usr/local/bin/
+
+HEALTHCHECK CMD ["docker-healthcheck"]

mongo/Dockerfile.latest

@@ -0,0 +1,5 @@
+FROM mongo:latest
+
+COPY docker-healthcheck /usr/local/bin/
+
+HEALTHCHECK CMD ["docker-healthcheck"]

mongo/docker-healthcheck

@@ -3,8 +3,17 @@ set -eo pipefail
 
 host="$(hostname --ip-address || echo '127.0.0.1')"
 
-if mongo --quiet "$host/test" --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 2)'; then
-	exit 0
-fi
+# mongo for version <= 4.4
+# mongosh for version >= 5.0
+for cmd in mongosh mongo; do
+	if ! command -v "$cmd" > /dev/null; then
+		continue;
+	fi
+
+	if "$cmd" --quiet "$host/test" --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 2)'; then
+		exit 0
+	fi
+
+done
 
 exit 1