diff --git a/services/chat/buildscript.txt b/services/chat/buildscript.txt index 25a0022096..65a6c1fd95 100644 --- a/services/chat/buildscript.txt +++ b/services/chat/buildscript.txt @@ -3,6 +3,8 @@ chat --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= +--esmock-loader=False +--has-custom-nodemon=True --node-version=16.17.1 --public-repo=False ---script-version=4.1.0 +--script-version=4.2.0 diff --git a/services/chat/docker-compose.ci.yml b/services/chat/docker-compose.ci.yml index 2fcf595760..75a8afa665 100644 --- a/services/chat/docker-compose.ci.yml +++ b/services/chat/docker-compose.ci.yml @@ -42,7 +42,7 @@ services: command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml index 99738494e6..91c46354db 100644 --- a/services/chat/docker-compose.yml +++ b/services/chat/docker-compose.yml @@ -44,7 +44,7 @@ services: command: npm run --silent test:acceptance mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/contacts/buildscript.txt b/services/contacts/buildscript.txt index 36c2789b55..83b76447c2 100644 --- a/services/contacts/buildscript.txt +++ b/services/contacts/buildscript.txt @@ -3,6 +3,8 @@ contacts --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= +--esmock-loader=True +--has-custom-nodemon=True --node-version=16.17.1 --public-repo=False ---script-version=4.1.0 +--script-version=4.2.0 diff --git a/services/contacts/docker-compose.ci.yml b/services/contacts/docker-compose.ci.yml index 2fcf595760..75a8afa665 100644 --- a/services/contacts/docker-compose.ci.yml +++ b/services/contacts/docker-compose.ci.yml @@ -42,7 +42,7 @@ services: command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml index 745b8ff710..31971da5d7 100644 --- a/services/contacts/docker-compose.yml +++ b/services/contacts/docker-compose.yml @@ -44,7 +44,7 @@ services: command: npm run --silent test:acceptance mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt index e875521c33..eddd99a5c6 100644 --- a/services/docstore/buildscript.txt +++ b/services/docstore/buildscript.txt @@ -3,6 +3,8 @@ docstore --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= +--esmock-loader=False +--has-custom-nodemon=True --node-version=16.17.1 --public-repo=True ---script-version=4.1.0 +--script-version=4.2.0 diff --git a/services/docstore/docker-compose.ci.yml b/services/docstore/docker-compose.ci.yml index aad0b1d2c0..242a07a0e9 100644 --- a/services/docstore/docker-compose.ci.yml +++ b/services/docstore/docker-compose.ci.yml @@ -51,7 +51,7 @@ services: command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml index e95e5f11e6..6de506da9f 100644 --- a/services/docstore/docker-compose.yml +++ b/services/docstore/docker-compose.yml @@ -53,7 +53,7 @@ services: command: npm run --silent test:acceptance mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt index 28c5cf434d..137d3c0630 100644 --- a/services/document-updater/buildscript.txt +++ b/services/document-updater/buildscript.txt @@ -3,6 +3,8 @@ document-updater --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= +--esmock-loader=False +--has-custom-nodemon=True --node-version=16.17.1 --public-repo=True ---script-version=4.1.0 +--script-version=4.2.0 diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml index b4f04f33bd..b9c0ed6e4c 100644 --- a/services/document-updater/docker-compose.ci.yml +++ b/services/document-updater/docker-compose.ci.yml @@ -51,7 +51,7 @@ services: retries: 20 mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml index 23e2797aa5..118ae0a49e 100644 --- a/services/document-updater/docker-compose.yml +++ b/services/document-updater/docker-compose.yml @@ -53,7 +53,7 @@ services: retries: 20 mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/history-v1/buildscript.txt b/services/history-v1/buildscript.txt index a0f67d781a..6aa469dbf1 100644 --- a/services/history-v1/buildscript.txt +++ b/services/history-v1/buildscript.txt @@ -3,6 +3,8 @@ history-v1 --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= +--esmock-loader=False +--has-custom-nodemon=True --node-version=16.17.1 --public-repo=False ---script-version=4.1.0 +--script-version=4.2.0 diff --git a/services/history-v1/docker-compose.ci.yml b/services/history-v1/docker-compose.ci.yml index 443c479b83..b7c8d0c821 100644 --- a/services/history-v1/docker-compose.ci.yml +++ b/services/history-v1/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.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/history-v1/docker-compose.yml b/services/history-v1/docker-compose.yml index 8ba1f14b34..7aed6304c6 100644 --- a/services/history-v1/docker-compose.yml +++ b/services/history-v1/docker-compose.yml @@ -52,7 +52,7 @@ services: command: npm run --silent test:acceptance mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index 06a2ce3bee..86b283c662 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -3,6 +3,8 @@ notifications --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= +--esmock-loader=False +--has-custom-nodemon=True --node-version=16.17.1 --public-repo=True ---script-version=4.1.0 +--script-version=4.2.0 diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml index 2fcf595760..75a8afa665 100644 --- a/services/notifications/docker-compose.ci.yml +++ b/services/notifications/docker-compose.ci.yml @@ -42,7 +42,7 @@ services: command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index d0044e081c..795e0056dc 100644 --- a/services/notifications/docker-compose.yml +++ b/services/notifications/docker-compose.yml @@ -44,7 +44,7 @@ services: command: npm run --silent test:acceptance mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/project-history/buildscript.txt b/services/project-history/buildscript.txt index 5cb01f49ea..0da616ec92 100644 --- a/services/project-history/buildscript.txt +++ b/services/project-history/buildscript.txt @@ -3,6 +3,8 @@ project-history --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= +--esmock-loader=True +--has-custom-nodemon=True --node-version=16.17.1 --public-repo=False ---script-version=4.1.0 +--script-version=4.2.0 diff --git a/services/project-history/docker-compose.ci.yml b/services/project-history/docker-compose.ci.yml index b4f04f33bd..b9c0ed6e4c 100644 --- a/services/project-history/docker-compose.ci.yml +++ b/services/project-history/docker-compose.ci.yml @@ -51,7 +51,7 @@ services: retries: 20 mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/project-history/docker-compose.yml b/services/project-history/docker-compose.yml index 3444430bcf..dcd84260c1 100644 --- a/services/project-history/docker-compose.yml +++ b/services/project-history/docker-compose.yml @@ -53,7 +53,7 @@ services: retries: 20 mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/project-history/package.json b/services/project-history/package.json index 027385400e..aba530479a 100644 --- a/services/project-history/package.json +++ b/services/project-history/package.json @@ -9,7 +9,7 @@ "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP", "start": "node $NODE_APP_OPTIONS app.js", "nodemon": "nodemon --config nodemon.json", - "test:acceptance:_run": "LOG_LEVEL=error mocha --loader=esmock --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js", + "test:acceptance:_run": "LOG_LEVEL=fatal mocha --loader=esmock --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js", "test:unit:_run": "LOG_LEVEL=fatal mocha --loader=esmock --recursive --reporter spec $@ test/unit/js", "lint": "eslint --max-warnings 0 --format unix .", "format": "prettier --list-different $PWD/'**/*.js'", diff --git a/services/track-changes/buildscript.txt b/services/track-changes/buildscript.txt index 8c0101898d..0f1470b696 100644 --- a/services/track-changes/buildscript.txt +++ b/services/track-changes/buildscript.txt @@ -3,6 +3,8 @@ track-changes --docker-repos=gcr.io/overleaf-ops --env-add=AWS_BUCKET=bucket --env-pass-through= +--esmock-loader=False +--has-custom-nodemon=True --node-version=16.17.1 --public-repo=True ---script-version=4.1.0 +--script-version=4.2.0 diff --git a/services/track-changes/docker-compose.ci.yml b/services/track-changes/docker-compose.ci.yml index c179b32fae..f484d2894a 100644 --- a/services/track-changes/docker-compose.ci.yml +++ b/services/track-changes/docker-compose.ci.yml @@ -58,7 +58,7 @@ services: retries: 20 mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/track-changes/docker-compose.yml b/services/track-changes/docker-compose.yml index 10da1e6a79..07bf43e18e 100644 --- a/services/track-changes/docker-compose.yml +++ b/services/track-changes/docker-compose.yml @@ -60,7 +60,7 @@ services: retries: 20 mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf healthcheck: test: "mongo --quiet localhost/test --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 1)'" diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml index a014963d47..e0726ed6ab 100644 --- a/services/web/docker-compose.ci.yml +++ b/services/web/docker-compose.ci.yml @@ -94,7 +94,7 @@ services: image: redis mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf ldap: diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml index e38930906f..1ba085007b 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -89,7 +89,7 @@ services: image: redis mongo: - image: mongo:4.4.16 + image: mongo:5.0.17 command: --replSet overleaf ldap: