From 0b985c7a0ba879badc4085aa23b334493cb498e5 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 20 Apr 2023 14:14:00 +0100 Subject: [PATCH] Merge pull request #12723 from overleaf/jpa-revert-node-18-upgrade [misc] revert node 18 upgrade GitOrigin-RevId: 752d45b015e2e8802b875b5de8ee044ba1170345 --- libraries/access-token-encryptor/.nvmrc | 2 +- .../access-token-encryptor/buildscript.txt | 2 +- libraries/logger/.nvmrc | 2 +- libraries/logger/buildscript.txt | 2 +- libraries/metrics/.nvmrc | 2 +- libraries/metrics/buildscript.txt | 2 +- libraries/o-error/.nvmrc | 2 +- libraries/o-error/buildscript.txt | 2 +- libraries/object-persistor/.nvmrc | 2 +- libraries/object-persistor/buildscript.txt | 2 +- libraries/overleaf-editor-core/.nvmrc | 2 +- .../overleaf-editor-core/buildscript.txt | 2 +- libraries/redis-wrapper/.nvmrc | 2 +- libraries/redis-wrapper/buildscript.txt | 2 +- libraries/settings/.nvmrc | 2 +- libraries/settings/buildscript.txt | 2 +- package-lock.json | 38 ++++++++++--------- services/chat/.nvmrc | 2 +- services/chat/Dockerfile | 2 +- services/chat/buildscript.txt | 2 +- services/chat/docker-compose.yml | 4 +- services/contacts/.nvmrc | 2 +- services/contacts/Dockerfile | 2 +- services/contacts/buildscript.txt | 2 +- services/contacts/docker-compose.yml | 4 +- services/docstore/.nvmrc | 2 +- services/docstore/Dockerfile | 2 +- services/docstore/buildscript.txt | 2 +- services/docstore/docker-compose.yml | 4 +- services/filestore/.nvmrc | 2 +- services/filestore/Dockerfile | 2 +- services/filestore/buildscript.txt | 2 +- .../test/acceptance/js/FilestoreTests.js | 29 +++++++------- services/notifications/.nvmrc | 2 +- services/notifications/Dockerfile | 2 +- services/notifications/buildscript.txt | 2 +- services/notifications/docker-compose.yml | 4 +- services/real-time/.nvmrc | 2 +- services/real-time/Dockerfile | 2 +- services/real-time/buildscript.txt | 2 +- services/real-time/docker-compose.yml | 4 +- services/track-changes/.nvmrc | 2 +- services/track-changes/Dockerfile | 2 +- services/track-changes/buildscript.txt | 2 +- services/track-changes/docker-compose.yml | 4 +- 45 files changed, 83 insertions(+), 82 deletions(-) diff --git a/libraries/access-token-encryptor/.nvmrc b/libraries/access-token-encryptor/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/libraries/access-token-encryptor/.nvmrc +++ b/libraries/access-token-encryptor/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/libraries/access-token-encryptor/buildscript.txt b/libraries/access-token-encryptor/buildscript.txt index 6fd14810e3..44d7e786e1 100644 --- a/libraries/access-token-encryptor/buildscript.txt +++ b/libraries/access-token-encryptor/buildscript.txt @@ -4,6 +4,6 @@ access-token-encryptor --env-add= --env-pass-through= --is-library=True ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=False --script-version=4.1.0 diff --git a/libraries/logger/.nvmrc b/libraries/logger/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/libraries/logger/.nvmrc +++ b/libraries/logger/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/libraries/logger/buildscript.txt b/libraries/logger/buildscript.txt index bad296357d..28eb541373 100644 --- a/libraries/logger/buildscript.txt +++ b/libraries/logger/buildscript.txt @@ -4,6 +4,6 @@ logger --env-add= --env-pass-through= --is-library=True ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=False --script-version=4.1.0 diff --git a/libraries/metrics/.nvmrc b/libraries/metrics/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/libraries/metrics/.nvmrc +++ b/libraries/metrics/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/libraries/metrics/buildscript.txt b/libraries/metrics/buildscript.txt index 0caf9da5bb..e612e0f5f9 100644 --- a/libraries/metrics/buildscript.txt +++ b/libraries/metrics/buildscript.txt @@ -4,6 +4,6 @@ metrics --env-add= --env-pass-through= --is-library=True ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=False --script-version=4.1.0 diff --git a/libraries/o-error/.nvmrc b/libraries/o-error/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/libraries/o-error/.nvmrc +++ b/libraries/o-error/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/libraries/o-error/buildscript.txt b/libraries/o-error/buildscript.txt index 6e36e7c759..d94c068a1c 100644 --- a/libraries/o-error/buildscript.txt +++ b/libraries/o-error/buildscript.txt @@ -4,6 +4,6 @@ o-error --env-add= --env-pass-through= --is-library=True ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=False --script-version=4.1.0 diff --git a/libraries/object-persistor/.nvmrc b/libraries/object-persistor/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/libraries/object-persistor/.nvmrc +++ b/libraries/object-persistor/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/libraries/object-persistor/buildscript.txt b/libraries/object-persistor/buildscript.txt index f0e4a443d9..814c6b1640 100644 --- a/libraries/object-persistor/buildscript.txt +++ b/libraries/object-persistor/buildscript.txt @@ -4,6 +4,6 @@ object-persistor --env-add= --env-pass-through= --is-library=True ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=False --script-version=4.1.0 diff --git a/libraries/overleaf-editor-core/.nvmrc b/libraries/overleaf-editor-core/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/libraries/overleaf-editor-core/.nvmrc +++ b/libraries/overleaf-editor-core/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/libraries/overleaf-editor-core/buildscript.txt b/libraries/overleaf-editor-core/buildscript.txt index 4bcd0bd90b..1775946e52 100644 --- a/libraries/overleaf-editor-core/buildscript.txt +++ b/libraries/overleaf-editor-core/buildscript.txt @@ -4,6 +4,6 @@ overleaf-editor-core --env-add= --env-pass-through= --is-library=True ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=False --script-version=4.1.0 diff --git a/libraries/redis-wrapper/.nvmrc b/libraries/redis-wrapper/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/libraries/redis-wrapper/.nvmrc +++ b/libraries/redis-wrapper/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/libraries/redis-wrapper/buildscript.txt b/libraries/redis-wrapper/buildscript.txt index e024f9311e..d06f963b61 100644 --- a/libraries/redis-wrapper/buildscript.txt +++ b/libraries/redis-wrapper/buildscript.txt @@ -4,6 +4,6 @@ redis-wrapper --env-add= --env-pass-through= --is-library=True ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=False --script-version=4.1.0 diff --git a/libraries/settings/.nvmrc b/libraries/settings/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/libraries/settings/.nvmrc +++ b/libraries/settings/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/libraries/settings/buildscript.txt b/libraries/settings/buildscript.txt index f1d9077288..8052f6d2c1 100644 --- a/libraries/settings/buildscript.txt +++ b/libraries/settings/buildscript.txt @@ -4,6 +4,6 @@ settings --env-add= --env-pass-through= --is-library=True ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=False --script-version=4.1.0 diff --git a/package-lock.json b/package-lock.json index e0df39b07b..088bb16d7c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15550,13 +15550,13 @@ "dev": true }, "node_modules/eslint-plugin-mocha": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz", - "integrity": "sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.0.4.tgz", + "integrity": "sha512-8wzAeepVY027oBHz/TmBmUr7vhVqoC1KTFeDybFLhbaWKx+aQ7fJJVuUsqcUy+L+G+XvgQBJY+cbAf7hl5DF7Q==", "dev": true, "dependencies": { "eslint-utils": "^3.0.0", - "rambda": "^7.1.0" + "ramda": "^0.28.0" }, "engines": { "node": ">=14.0.0" @@ -27042,11 +27042,15 @@ "node": ">=4" } }, - "node_modules/rambda": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/rambda/-/rambda-7.5.0.tgz", - "integrity": "sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA==", - "dev": true + "node_modules/ramda": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.28.0.tgz", + "integrity": "sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/ramda" + } }, "node_modules/random-bytes": { "version": "1.0.0", @@ -53035,13 +53039,13 @@ } }, "eslint-plugin-mocha": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz", - "integrity": "sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-10.0.4.tgz", + "integrity": "sha512-8wzAeepVY027oBHz/TmBmUr7vhVqoC1KTFeDybFLhbaWKx+aQ7fJJVuUsqcUy+L+G+XvgQBJY+cbAf7hl5DF7Q==", "dev": true, "requires": { "eslint-utils": "^3.0.0", - "rambda": "^7.1.0" + "ramda": "^0.28.0" }, "dependencies": { "eslint-utils": { @@ -62170,10 +62174,10 @@ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz", "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=" }, - "rambda": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/rambda/-/rambda-7.5.0.tgz", - "integrity": "sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA==", + "ramda": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.28.0.tgz", + "integrity": "sha512-9QnLuG/kPVgWvMQ4aODhsBUFKOUmnbUnsSXACv+NCQZcHbeb+v8Lodp8OVxtRULN1/xOyYLLaL6npE6dMq5QTA==", "dev": true }, "random-bytes": { diff --git a/services/chat/.nvmrc b/services/chat/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/services/chat/.nvmrc +++ b/services/chat/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/services/chat/Dockerfile b/services/chat/Dockerfile index b3ef0ab68b..87c955871b 100644 --- a/services/chat/Dockerfile +++ b/services/chat/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.16.0 as base +FROM node:16.17.1 as base WORKDIR /overleaf/services/chat diff --git a/services/chat/buildscript.txt b/services/chat/buildscript.txt index d50a655169..25a0022096 100644 --- a/services/chat/buildscript.txt +++ b/services/chat/buildscript.txt @@ -3,6 +3,6 @@ chat --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=False --script-version=4.1.0 diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml index f88fe44b97..99738494e6 100644 --- a/services/chat/docker-compose.yml +++ b/services/chat/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/chat - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/chat - ../../node_modules:/overleaf/node_modules diff --git a/services/contacts/.nvmrc b/services/contacts/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/services/contacts/.nvmrc +++ b/services/contacts/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/services/contacts/Dockerfile b/services/contacts/Dockerfile index 8c10323be0..2091a63333 100644 --- a/services/contacts/Dockerfile +++ b/services/contacts/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.16.0 as base +FROM node:16.17.1 as base WORKDIR /overleaf/services/contacts diff --git a/services/contacts/buildscript.txt b/services/contacts/buildscript.txt index ed2a0c4c57..36c2789b55 100644 --- a/services/contacts/buildscript.txt +++ b/services/contacts/buildscript.txt @@ -3,6 +3,6 @@ contacts --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=False --script-version=4.1.0 diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml index e80e794f8d..745b8ff710 100644 --- a/services/contacts/docker-compose.yml +++ b/services/contacts/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/contacts - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/contacts - ../../node_modules:/overleaf/node_modules diff --git a/services/docstore/.nvmrc b/services/docstore/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/services/docstore/.nvmrc +++ b/services/docstore/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/services/docstore/Dockerfile b/services/docstore/Dockerfile index 1e72901bbd..6cdbb3c82f 100644 --- a/services/docstore/Dockerfile +++ b/services/docstore/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.16.0 as base +FROM node:16.17.1 as base WORKDIR /overleaf/services/docstore diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt index e47ec833d4..e875521c33 100644 --- a/services/docstore/buildscript.txt +++ b/services/docstore/buildscript.txt @@ -3,6 +3,6 @@ docstore --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=True --script-version=4.1.0 diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml index d2b9f6cd70..e95e5f11e6 100644 --- a/services/docstore/docker-compose.yml +++ b/services/docstore/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/docstore - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/docstore - ../../node_modules:/overleaf/node_modules diff --git a/services/filestore/.nvmrc b/services/filestore/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/services/filestore/.nvmrc +++ b/services/filestore/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/services/filestore/Dockerfile b/services/filestore/Dockerfile index 4b4a7d8383..93d2766e9b 100644 --- a/services/filestore/Dockerfile +++ b/services/filestore/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.16.0 as base +FROM node:16.17.1 as base WORKDIR /overleaf/services/filestore COPY services/filestore/install_deps.sh /overleaf/services/filestore/ diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index 03c9a1f054..86e2285f74 100644 --- a/services/filestore/buildscript.txt +++ b/services/filestore/buildscript.txt @@ -4,6 +4,6 @@ filestore --docker-repos=gcr.io/overleaf-ops --env-add=ENABLE_CONVERSIONS="true",USE_PROM_METRICS="true",AWS_S3_USER_FILES_BUCKET_NAME=fake_user_files,AWS_S3_TEMPLATE_FILES_BUCKET_NAME=fake_template_files,AWS_S3_PUBLIC_FILES_BUCKET_NAME=fake_public_files,GCS_USER_FILES_BUCKET_NAME=fake_userfiles,GCS_TEMPLATE_FILES_BUCKET_NAME=fake_templatefiles,GCS_PUBLIC_FILES_BUCKET_NAME=fake_publicfiles --env-pass-through= ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=True --script-version=4.1.0 diff --git a/services/filestore/test/acceptance/js/FilestoreTests.js b/services/filestore/test/acceptance/js/FilestoreTests.js index a0232a40c1..ab9261901c 100644 --- a/services/filestore/test/acceptance/js/FilestoreTests.js +++ b/services/filestore/test/acceptance/js/FilestoreTests.js @@ -13,9 +13,11 @@ const streamifier = require('streamifier') chai.use(require('chai-as-promised')) const { ObjectId } = require('mongodb') const tk = require('timekeeper') +const ChildProcess = require('child_process') const fsWriteFile = promisify(fs.writeFile) const fsStat = promisify(fs.stat) +const exec = promisify(ChildProcess.exec) const msleep = promisify(setTimeout) if (!process.env.AWS_ACCESS_KEY_ID) { @@ -40,24 +42,19 @@ describe('Filestore', function () { async function expectNoSockets() { try { await msleep(1000) - const stdout = await fs.promises.readFile('/proc/net/tcp', 'utf8') + const { stdout } = await exec('ss -tnH') + const badSockets = [] - const lines = stdout.split('\n').map(line => line.trim().split(/\s+/)) - const header = lines.shift() - if (header[4] === 'tx_queue' && header[5] === 'rx_queue') { - for (const socket of lines) { - if ( - socket.length > 5 && - socket[4] !== '00000000:00000000' && // ensure the socket queues are empty - !seenSockets.includes(socket) - ) { - console.log('socket still has data', socket) - badSockets.push(socket) - seenSockets.push(socket) - } + for (const socket of stdout.split('\n')) { + const fields = socket.split(' ').filter(part => part !== '') + if ( + fields.length > 2 && + parseInt(fields[1]) && + !seenSockets.includes(socket) + ) { + badSockets.push(socket) + seenSockets.push(socket) } - } else { - throw new Error('unexpected format in /proc/net/tcp') } if (badSockets.length) { diff --git a/services/notifications/.nvmrc b/services/notifications/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/services/notifications/.nvmrc +++ b/services/notifications/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile index f61a1d7889..e0ced2119c 100644 --- a/services/notifications/Dockerfile +++ b/services/notifications/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.16.0 as base +FROM node:16.17.1 as base WORKDIR /overleaf/services/notifications diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index 1ab741517e..06a2ce3bee 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -3,6 +3,6 @@ notifications --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=True --script-version=4.1.0 diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index cea0d85744..d0044e081c 100644 --- a/services/notifications/docker-compose.yml +++ b/services/notifications/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/notifications - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/notifications - ../../node_modules:/overleaf/node_modules diff --git a/services/real-time/.nvmrc b/services/real-time/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/services/real-time/.nvmrc +++ b/services/real-time/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/services/real-time/Dockerfile b/services/real-time/Dockerfile index dca88d0592..f597b5fe5a 100644 --- a/services/real-time/Dockerfile +++ b/services/real-time/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.16.0 as base +FROM node:16.17.1 as base WORKDIR /overleaf/services/real-time diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 29bc04f174..c442c0564a 100644 --- a/services/real-time/buildscript.txt +++ b/services/real-time/buildscript.txt @@ -3,6 +3,6 @@ real-time --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=True --script-version=4.1.0 diff --git a/services/real-time/docker-compose.yml b/services/real-time/docker-compose.yml index f7482fe52c..62102fbe38 100644 --- a/services/real-time/docker-compose.yml +++ b/services/real-time/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/real-time - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/real-time - ../../node_modules:/overleaf/node_modules diff --git a/services/track-changes/.nvmrc b/services/track-changes/.nvmrc index 6d80269a4f..c85fa1bbef 100644 --- a/services/track-changes/.nvmrc +++ b/services/track-changes/.nvmrc @@ -1 +1 @@ -18.16.0 +16.17.1 diff --git a/services/track-changes/Dockerfile b/services/track-changes/Dockerfile index 02f0a7b95c..06b522f338 100644 --- a/services/track-changes/Dockerfile +++ b/services/track-changes/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:18.16.0 as base +FROM node:16.17.1 as base WORKDIR /overleaf/services/track-changes diff --git a/services/track-changes/buildscript.txt b/services/track-changes/buildscript.txt index 6b9c2e2ff3..8c0101898d 100644 --- a/services/track-changes/buildscript.txt +++ b/services/track-changes/buildscript.txt @@ -3,6 +3,6 @@ track-changes --docker-repos=gcr.io/overleaf-ops --env-add=AWS_BUCKET=bucket --env-pass-through= ---node-version=18.16.0 +--node-version=16.17.1 --public-repo=True --script-version=4.1.0 diff --git a/services/track-changes/docker-compose.yml b/services/track-changes/docker-compose.yml index 8c1903d590..10da1e6a79 100644 --- a/services/track-changes/docker-compose.yml +++ b/services/track-changes/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/track-changes - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:18.16.0 + image: node:16.17.1 volumes: - .:/overleaf/services/track-changes - ../../node_modules:/overleaf/node_modules