From f2bea32dd850c26de58b859485ee98a564271ee7 Mon Sep 17 00:00:00 2001
From: Hendrik Bonthuys <156313577+hendrikov@users.noreply.github.com>
Date: Tue, 13 Feb 2024 10:06:03 +0000
Subject: [PATCH] Merge pull request #16849 from
 overleaf/hb-issue-16799-mongdodb-v5-to-v6

Bump mongo from 5 to 6 in the dev environment

GitOrigin-RevId: 7b5aa0be57e93e1788acf55405e645556c8eaa13
---
 services/chat/Makefile                          | 4 ++--
 services/chat/docker-compose.ci.yml             | 4 ++--
 services/chat/docker-compose.yml                | 4 ++--
 services/contacts/Makefile                      | 4 ++--
 services/contacts/docker-compose.ci.yml         | 4 ++--
 services/contacts/docker-compose.yml            | 4 ++--
 services/docstore/Makefile                      | 4 ++--
 services/docstore/docker-compose.ci.yml         | 4 ++--
 services/docstore/docker-compose.yml            | 4 ++--
 services/document-updater/Makefile              | 4 ++--
 services/document-updater/docker-compose.ci.yml | 4 ++--
 services/document-updater/docker-compose.yml    | 4 ++--
 services/history-v1/Makefile                    | 4 ++--
 services/history-v1/docker-compose.ci.yml       | 4 ++--
 services/history-v1/docker-compose.yml          | 4 ++--
 services/notifications/Makefile                 | 4 ++--
 services/notifications/docker-compose.ci.yml    | 4 ++--
 services/notifications/docker-compose.yml       | 4 ++--
 services/project-history/Makefile               | 4 ++--
 services/project-history/docker-compose.ci.yml  | 4 ++--
 services/project-history/docker-compose.yml     | 4 ++--
 services/web/Makefile                           | 4 ++--
 services/web/docker-compose.ci.yml              | 2 +-
 services/web/docker-compose.yml                 | 2 +-
 24 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/services/chat/Makefile b/services/chat/Makefile
index 4b7e994909..92a1063a7d 100644
--- a/services/chat/Makefile
+++ b/services/chat/Makefile
@@ -91,11 +91,11 @@ test_acceptance_clean:
 test_acceptance_pre_run:
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) up -d mongo
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) exec -T mongo sh -c ' \
-		while ! mongo --eval "db.version()" > /dev/null; do \
+		while ! mongosh --eval "db.version()" > /dev/null; do \
 			echo "Waiting for Mongo..."; \
 			sleep 1; \
 		done; \
-		mongo --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
+		mongosh --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
 ifneq (,$(wildcard test/acceptance/js/scripts/pre-run))
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run
 endif
diff --git a/services/chat/docker-compose.ci.yml b/services/chat/docker-compose.ci.yml
index 75a8afa665..2ccdc8e541 100644
--- a/services/chat/docker-compose.ci.yml
+++ b/services/chat/docker-compose.ci.yml
@@ -42,9 +42,9 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml
index b91ad25767..e9f63a7d9b 100644
--- a/services/chat/docker-compose.yml
+++ b/services/chat/docker-compose.yml
@@ -44,10 +44,10 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
 
diff --git a/services/contacts/Makefile b/services/contacts/Makefile
index 0fa7a57c8b..ca0811727c 100644
--- a/services/contacts/Makefile
+++ b/services/contacts/Makefile
@@ -91,11 +91,11 @@ test_acceptance_clean:
 test_acceptance_pre_run:
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) up -d mongo
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) exec -T mongo sh -c ' \
-		while ! mongo --eval "db.version()" > /dev/null; do \
+		while ! mongosh --eval "db.version()" > /dev/null; do \
 			echo "Waiting for Mongo..."; \
 			sleep 1; \
 		done; \
-		mongo --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
+		mongosh --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
 ifneq (,$(wildcard test/acceptance/js/scripts/pre-run))
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run
 endif
diff --git a/services/contacts/docker-compose.ci.yml b/services/contacts/docker-compose.ci.yml
index 75a8afa665..2ccdc8e541 100644
--- a/services/contacts/docker-compose.ci.yml
+++ b/services/contacts/docker-compose.ci.yml
@@ -42,9 +42,9 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml
index f080b75c9d..a98e960084 100644
--- a/services/contacts/docker-compose.yml
+++ b/services/contacts/docker-compose.yml
@@ -44,10 +44,10 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
 
diff --git a/services/docstore/Makefile b/services/docstore/Makefile
index 0a7b2d2908..f250316096 100644
--- a/services/docstore/Makefile
+++ b/services/docstore/Makefile
@@ -91,11 +91,11 @@ test_acceptance_clean:
 test_acceptance_pre_run:
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) up -d mongo
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) exec -T mongo sh -c ' \
-		while ! mongo --eval "db.version()" > /dev/null; do \
+		while ! mongosh --eval "db.version()" > /dev/null; do \
 			echo "Waiting for Mongo..."; \
 			sleep 1; \
 		done; \
-		mongo --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
+		mongosh --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
 ifneq (,$(wildcard test/acceptance/js/scripts/pre-run))
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run
 endif
diff --git a/services/docstore/docker-compose.ci.yml b/services/docstore/docker-compose.ci.yml
index 6f06b85a93..3415762a91 100644
--- a/services/docstore/docker-compose.ci.yml
+++ b/services/docstore/docker-compose.ci.yml
@@ -50,10 +50,10 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
   gcs:
diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml
index 4b7aa41408..92741dd8c9 100644
--- a/services/docstore/docker-compose.yml
+++ b/services/docstore/docker-compose.yml
@@ -52,10 +52,10 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
 
diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile
index 2ab3313795..86dcf217e6 100644
--- a/services/document-updater/Makefile
+++ b/services/document-updater/Makefile
@@ -91,11 +91,11 @@ test_acceptance_clean:
 test_acceptance_pre_run:
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) up -d mongo
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) exec -T mongo sh -c ' \
-		while ! mongo --eval "db.version()" > /dev/null; do \
+		while ! mongosh --eval "db.version()" > /dev/null; do \
 			echo "Waiting for Mongo..."; \
 			sleep 1; \
 		done; \
-		mongo --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
+		mongosh --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
 ifneq (,$(wildcard test/acceptance/js/scripts/pre-run))
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run
 endif
diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml
index b9c0ed6e4c..3ac06fb396 100644
--- a/services/document-updater/docker-compose.ci.yml
+++ b/services/document-updater/docker-compose.ci.yml
@@ -51,9 +51,9 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml
index f1d080cf60..5792e55ae0 100644
--- a/services/document-updater/docker-compose.yml
+++ b/services/document-updater/docker-compose.yml
@@ -53,10 +53,10 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
 
diff --git a/services/history-v1/Makefile b/services/history-v1/Makefile
index dc490cf895..612a770e09 100644
--- a/services/history-v1/Makefile
+++ b/services/history-v1/Makefile
@@ -91,11 +91,11 @@ test_acceptance_clean:
 test_acceptance_pre_run:
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) up -d mongo
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) exec -T mongo sh -c ' \
-		while ! mongo --eval "db.version()" > /dev/null; do \
+		while ! mongosh --eval "db.version()" > /dev/null; do \
 			echo "Waiting for Mongo..."; \
 			sleep 1; \
 		done; \
-		mongo --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
+		mongosh --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
 ifneq (,$(wildcard test/acceptance/js/scripts/pre-run))
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run
 endif
diff --git a/services/history-v1/docker-compose.ci.yml b/services/history-v1/docker-compose.ci.yml
index 62a2719003..4c7269e997 100644
--- a/services/history-v1/docker-compose.ci.yml
+++ b/services/history-v1/docker-compose.ci.yml
@@ -49,10 +49,10 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
   postgres:
diff --git a/services/history-v1/docker-compose.yml b/services/history-v1/docker-compose.yml
index bed2d78e6f..fb835d3aaf 100644
--- a/services/history-v1/docker-compose.yml
+++ b/services/history-v1/docker-compose.yml
@@ -51,10 +51,10 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
 
diff --git a/services/notifications/Makefile b/services/notifications/Makefile
index 4521201dfb..cce99951a2 100644
--- a/services/notifications/Makefile
+++ b/services/notifications/Makefile
@@ -91,11 +91,11 @@ test_acceptance_clean:
 test_acceptance_pre_run:
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) up -d mongo
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) exec -T mongo sh -c ' \
-		while ! mongo --eval "db.version()" > /dev/null; do \
+		while ! mongosh --eval "db.version()" > /dev/null; do \
 			echo "Waiting for Mongo..."; \
 			sleep 1; \
 		done; \
-		mongo --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
+		mongosh --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
 ifneq (,$(wildcard test/acceptance/js/scripts/pre-run))
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run
 endif
diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml
index 75a8afa665..2ccdc8e541 100644
--- a/services/notifications/docker-compose.ci.yml
+++ b/services/notifications/docker-compose.ci.yml
@@ -42,9 +42,9 @@ services:
     command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs .
     user: root
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml
index a45282e26d..78f573a487 100644
--- a/services/notifications/docker-compose.yml
+++ b/services/notifications/docker-compose.yml
@@ -44,10 +44,10 @@ services:
     command: npm run --silent test:acceptance
 
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
 
diff --git a/services/project-history/Makefile b/services/project-history/Makefile
index e989160d39..535633c09a 100644
--- a/services/project-history/Makefile
+++ b/services/project-history/Makefile
@@ -91,11 +91,11 @@ test_acceptance_clean:
 test_acceptance_pre_run:
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) up -d mongo
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) exec -T mongo sh -c ' \
-		while ! mongo --eval "db.version()" > /dev/null; do \
+		while ! mongosh --eval "db.version()" > /dev/null; do \
 			echo "Waiting for Mongo..."; \
 			sleep 1; \
 		done; \
-		mongo --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
+		mongosh --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
 ifneq (,$(wildcard test/acceptance/js/scripts/pre-run))
 	$(DOCKER_COMPOSE_TEST_ACCEPTANCE) run --rm test_acceptance test/acceptance/js/scripts/pre-run
 endif
diff --git a/services/project-history/docker-compose.ci.yml b/services/project-history/docker-compose.ci.yml
index b9c0ed6e4c..3ac06fb396 100644
--- a/services/project-history/docker-compose.ci.yml
+++ b/services/project-history/docker-compose.ci.yml
@@ -51,9 +51,9 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
diff --git a/services/project-history/docker-compose.yml b/services/project-history/docker-compose.yml
index 295c8e7bb5..2386034b2e 100644
--- a/services/project-history/docker-compose.yml
+++ b/services/project-history/docker-compose.yml
@@ -53,10 +53,10 @@ services:
       retries: 20
 
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
     healthcheck:
-      test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
+      test: "mongosh --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'"
       interval: 1s
       retries: 20
 
diff --git a/services/web/Makefile b/services/web/Makefile
index b9eb20eeba..88c58f7e49 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -161,11 +161,11 @@ test_frontend_ct_editor:
 TEST_ACCEPTANCE_MONGO_INIT := \
 	$(DOCKER_COMPOSE) up -d mongo; \
 	$(DOCKER_COMPOSE) exec -T mongo sh -c ' \
-		while ! mongo --eval "db.version()" > /dev/null; do \
+		while ! mongosh --eval "db.version()" > /dev/null; do \
 			echo "Waiting for Mongo..."; \
 			sleep 1; \
 		done; \
-		mongo --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
+		mongosh --eval "rs.initiate({ _id: \"overleaf\", members: [ { _id: 0, host: \"mongo:27017\" } ] })"'
 
 test_acceptance: test_acceptance_app test_acceptance_modules
 test_acceptance_saas: test_acceptance_app_saas test_acceptance_modules_merged_saas
diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml
index 502a2c4da5..cc5465b459 100644
--- a/services/web/docker-compose.ci.yml
+++ b/services/web/docker-compose.ci.yml
@@ -80,7 +80,7 @@ services:
     image: redis
 
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
 
   ldap:
diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml
index 2aa1552da4..1452ae94f2 100644
--- a/services/web/docker-compose.yml
+++ b/services/web/docker-compose.yml
@@ -79,7 +79,7 @@ services:
     image: redis
 
   mongo:
-    image: mongo:5.0.17
+    image: mongo:6.0.13
     command: --replSet overleaf
 
   ldap: