From 8197411cdf6d48e481d6154cbcaa8aaffeb6b7af Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 14 Sep 2021 13:07:33 +0100 Subject: [PATCH] Merge pull request #4891 from overleaf/ho-web-mongo-4-2 bump mongo to 4.2.15 GitOrigin-RevId: 1ac2057f264bd6dbe042d8f999a4ab1054c9edf5 --- services/chat/docker-compose.ci.yml | 2 +- services/chat/docker-compose.yml | 2 +- services/contacts/docker-compose.ci.yml | 2 +- services/contacts/docker-compose.yml | 2 +- services/docstore/docker-compose.ci.yml | 2 +- services/docstore/docker-compose.yml | 2 +- services/document-updater/docker-compose.ci.yml | 2 +- services/document-updater/docker-compose.yml | 2 +- services/notifications/docker-compose.ci.yml | 2 +- services/notifications/docker-compose.yml | 2 +- services/spelling/docker-compose.ci.yml | 2 +- services/spelling/docker-compose.yml | 2 +- services/track-changes/docker-compose.ci.yml | 2 +- services/track-changes/docker-compose.yml | 2 +- services/web/docker-compose.ci.yml | 2 +- services/web/docker-compose.yml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/services/chat/docker-compose.ci.yml b/services/chat/docker-compose.ci.yml index 47fcec0c68..73114a581f 100644 --- a/services/chat/docker-compose.ci.yml +++ b/services/chat/docker-compose.ci.yml @@ -41,7 +41,7 @@ services: command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml index 63c89c578e..02c6e5dfca 100644 --- a/services/chat/docker-compose.yml +++ b/services/chat/docker-compose.yml @@ -39,7 +39,7 @@ services: command: npm run --silent test:acceptance mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/contacts/docker-compose.ci.yml b/services/contacts/docker-compose.ci.yml index 47fcec0c68..73114a581f 100644 --- a/services/contacts/docker-compose.ci.yml +++ b/services/contacts/docker-compose.ci.yml @@ -41,7 +41,7 @@ services: command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml index 63c89c578e..02c6e5dfca 100644 --- a/services/contacts/docker-compose.yml +++ b/services/contacts/docker-compose.yml @@ -39,7 +39,7 @@ services: command: npm run --silent test:acceptance mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/docstore/docker-compose.ci.yml b/services/docstore/docker-compose.ci.yml index f0cac0710e..f0733448cc 100644 --- a/services/docstore/docker-compose.ci.yml +++ b/services/docstore/docker-compose.ci.yml @@ -50,7 +50,7 @@ services: command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml index 89e94ce7ce..76694d377e 100644 --- a/services/docstore/docker-compose.yml +++ b/services/docstore/docker-compose.yml @@ -48,7 +48,7 @@ services: command: npm run --silent test:acceptance mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml index 1a25b3bf15..9acaacf369 100644 --- a/services/document-updater/docker-compose.ci.yml +++ b/services/document-updater/docker-compose.ci.yml @@ -50,7 +50,7 @@ services: retries: 20 mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml index e3c720c9cd..f6abd89912 100644 --- a/services/document-updater/docker-compose.yml +++ b/services/document-updater/docker-compose.yml @@ -48,7 +48,7 @@ services: retries: 20 mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml index 47fcec0c68..73114a581f 100644 --- a/services/notifications/docker-compose.ci.yml +++ b/services/notifications/docker-compose.ci.yml @@ -41,7 +41,7 @@ services: command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index 63c89c578e..02c6e5dfca 100644 --- a/services/notifications/docker-compose.yml +++ b/services/notifications/docker-compose.yml @@ -39,7 +39,7 @@ services: command: npm run --silent test:acceptance mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/spelling/docker-compose.ci.yml b/services/spelling/docker-compose.ci.yml index 47fcec0c68..73114a581f 100644 --- a/services/spelling/docker-compose.ci.yml +++ b/services/spelling/docker-compose.ci.yml @@ -41,7 +41,7 @@ services: command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/spelling/docker-compose.yml b/services/spelling/docker-compose.yml index b7ab39847e..03ae188514 100644 --- a/services/spelling/docker-compose.yml +++ b/services/spelling/docker-compose.yml @@ -43,7 +43,7 @@ services: command: npm run --silent test:acceptance mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/track-changes/docker-compose.ci.yml b/services/track-changes/docker-compose.ci.yml index 3797853153..bc6172b2cb 100644 --- a/services/track-changes/docker-compose.ci.yml +++ b/services/track-changes/docker-compose.ci.yml @@ -57,7 +57,7 @@ services: retries: 20 mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/track-changes/docker-compose.yml b/services/track-changes/docker-compose.yml index c4bac32698..3b0957ea52 100644 --- a/services/track-changes/docker-compose.yml +++ b/services/track-changes/docker-compose.yml @@ -55,7 +55,7 @@ services: retries: 20 mongo: - image: mongo:4.0 + image: mongo:4.2.15 healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" interval: 1s diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml index c0fb7f58db..6cccaaafd7 100644 --- a/services/web/docker-compose.ci.yml +++ b/services/web/docker-compose.ci.yml @@ -66,7 +66,7 @@ services: image: redis mongo: - image: mongo:4.0.19 + image: mongo:4.2.15 ldap: restart: always diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml index 95a6242e96..45c59b1d97 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -71,7 +71,7 @@ services: image: redis mongo: - image: mongo:4.0.19 + image: mongo:4.2.15 ldap: restart: always