agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-12 13:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16849 from overleaf/hb-issue-16799-mongdodb-v5-to-v6

Browse Source 
Bump mongo from 5 to 6 in the dev environment

GitOrigin-RevId: 7b5aa0be57e93e1788acf55405e645556c8eaa13
This commit is contained in:
Hendrik Bonthuys
2024-02-14 09:04:38 +00:00
committed by Copybot
parent 87cd480151
commit f2bea32dd8
24 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/contacts/Makefile
+2 -2
View File
@@ -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
services/contacts/docker-compose.ci.yml
+2 -2
View File
@@ -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
services/contacts/docker-compose.yml
+2 -2
View File
@@ -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