From 2261e761f49590aa6a4faf7a228c609805b287fe Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 18 Nov 2021 14:43:07 +0100 Subject: [PATCH] Merge pull request #5705 from overleaf/jpa-node-14 [misc] upgrade node version from 12 to 14 GitOrigin-RevId: 15c465c7bb5e42b0c71e2dedb09cf4fe9f1d8ec6 --- libraries/access-token-encryptor/.nvmrc | 2 +- libraries/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/redis-wrapper/.nvmrc | 2 +- libraries/redis-wrapper/buildscript.txt | 2 +- libraries/settings/.nvmrc | 2 +- libraries/settings/buildscript.txt | 2 +- server-ce/Dockerfile-base | 4 ++-- services/chat/.nvmrc | 2 +- services/chat/Dockerfile | 2 +- services/chat/buildscript.txt | 2 +- services/chat/docker-compose.yml | 4 ++-- services/clsi/.nvmrc | 2 +- services/clsi/Dockerfile | 2 +- services/clsi/buildscript.txt | 2 +- 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/document-updater/.nvmrc | 2 +- services/document-updater/Dockerfile | 2 +- services/document-updater/buildscript.txt | 2 +- services/document-updater/docker-compose.yml | 4 ++-- services/filestore/.nvmrc | 2 +- services/filestore/Dockerfile | 2 +- services/filestore/app/js/FileHandler.js | 3 +++ services/filestore/buildscript.txt | 2 +- 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/spelling/.nvmrc | 2 +- services/spelling/Dockerfile | 2 +- services/spelling/buildscript.txt | 2 +- services/track-changes/.nvmrc | 2 +- services/track-changes/Dockerfile | 2 +- services/track-changes/buildscript.txt | 2 +- services/track-changes/docker-compose.yml | 4 ++-- services/web/Dockerfile | 2 +- services/web/Dockerfile.frontend | 2 +- services/web/docker-compose.yml | 2 +- services/web/scripts/translations/Dockerfile | 2 +- 57 files changed, 67 insertions(+), 64 deletions(-) diff --git a/libraries/access-token-encryptor/.nvmrc b/libraries/access-token-encryptor/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/libraries/access-token-encryptor/.nvmrc +++ b/libraries/access-token-encryptor/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/libraries/access-token-encryptor/buildscript.txt b/libraries/access-token-encryptor/buildscript.txt index c61653aa6a..97826bad0e 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=12.22.7 +--node-version=14.18.1 --public-repo=False --script-version=3.11.0 diff --git a/libraries/logger/.nvmrc b/libraries/logger/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/libraries/logger/.nvmrc +++ b/libraries/logger/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/libraries/logger/buildscript.txt b/libraries/logger/buildscript.txt index b5c76a4100..8737b651a4 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=12.22.7 +--node-version=14.18.1 --public-repo=False --script-version=3.11.0 diff --git a/libraries/metrics/.nvmrc b/libraries/metrics/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/libraries/metrics/.nvmrc +++ b/libraries/metrics/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/libraries/metrics/buildscript.txt b/libraries/metrics/buildscript.txt index 3f17d0d2be..f6d28b010d 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=12.22.7 +--node-version=14.18.1 --public-repo=False --script-version=3.11.0 diff --git a/libraries/o-error/.nvmrc b/libraries/o-error/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/libraries/o-error/.nvmrc +++ b/libraries/o-error/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/libraries/o-error/buildscript.txt b/libraries/o-error/buildscript.txt index d4668aa1a4..f3a704344c 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=12.22.7 +--node-version=14.18.1 --public-repo=False --script-version=3.11.0 diff --git a/libraries/object-persistor/.nvmrc b/libraries/object-persistor/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/libraries/object-persistor/.nvmrc +++ b/libraries/object-persistor/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/libraries/object-persistor/buildscript.txt b/libraries/object-persistor/buildscript.txt index f49c1adc94..0f393c6452 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=12.22.7 +--node-version=14.18.1 --public-repo=False --script-version=3.11.0 diff --git a/libraries/redis-wrapper/.nvmrc b/libraries/redis-wrapper/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/libraries/redis-wrapper/.nvmrc +++ b/libraries/redis-wrapper/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/libraries/redis-wrapper/buildscript.txt b/libraries/redis-wrapper/buildscript.txt index f0d30ccc66..f9c10278f8 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=12.22.7 +--node-version=14.18.1 --public-repo=False --script-version=3.11.0 diff --git a/libraries/settings/.nvmrc b/libraries/settings/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/libraries/settings/.nvmrc +++ b/libraries/settings/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/libraries/settings/buildscript.txt b/libraries/settings/buildscript.txt index ae3af2e2c1..4a931ab868 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=12.22.7 +--node-version=14.18.1 --public-repo=False --script-version=3.11.0 diff --git a/server-ce/Dockerfile-base b/server-ce/Dockerfile-base index 00716701fe..278da0e238 100644 --- a/server-ce/Dockerfile-base +++ b/server-ce/Dockerfile-base @@ -17,8 +17,8 @@ RUN apt-get update \ qpdf \ aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-nr aspell-ns aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-ss aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu \ \ -# install Node.JS 12 -&& curl -sSL https://deb.nodesource.com/setup_12.x | bash - \ +# install Node.JS 14 +&& curl -sSL https://deb.nodesource.com/setup_14.x | bash - \ && apt-get install -y nodejs \ \ && rm -rf \ diff --git a/services/chat/.nvmrc b/services/chat/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/services/chat/.nvmrc +++ b/services/chat/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/services/chat/Dockerfile b/services/chat/Dockerfile index 20825d530c..f203639813 100644 --- a/services/chat/Dockerfile +++ b/services/chat/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -FROM node:12.22.7 as base +FROM node:14.18.1 as base WORKDIR /app diff --git a/services/chat/buildscript.txt b/services/chat/buildscript.txt index fedebd8bdc..583197e6c4 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=12.22.7 +--node-version=14.18.1 --public-repo=False --script-version=3.11.0 diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml index 71e11d9bd3..3cedb93e59 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:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app @@ -18,7 +18,7 @@ services: user: node test_acceptance: - image: node:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app diff --git a/services/clsi/.nvmrc b/services/clsi/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/services/clsi/.nvmrc +++ b/services/clsi/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/services/clsi/Dockerfile b/services/clsi/Dockerfile index ffac2d7f7e..41ffb1064a 100644 --- a/services/clsi/Dockerfile +++ b/services/clsi/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -FROM node:12.22.7 as base +FROM node:14.18.1 as base WORKDIR /app COPY install_deps.sh /app diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt index d7dc72f046..bce772aa35 100644 --- a/services/clsi/buildscript.txt +++ b/services/clsi/buildscript.txt @@ -5,6 +5,6 @@ clsi --env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true" --env-pass-through=TEXLIVE_IMAGE --has-custom-cloudbuild=True ---node-version=12.22.7 +--node-version=14.18.1 --public-repo=True --script-version=3.11.0 diff --git a/services/contacts/.nvmrc b/services/contacts/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/services/contacts/.nvmrc +++ b/services/contacts/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/services/contacts/Dockerfile b/services/contacts/Dockerfile index 20825d530c..f203639813 100644 --- a/services/contacts/Dockerfile +++ b/services/contacts/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -FROM node:12.22.7 as base +FROM node:14.18.1 as base WORKDIR /app diff --git a/services/contacts/buildscript.txt b/services/contacts/buildscript.txt index bf5eec0f38..8e203ef9c4 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=12.22.7 +--node-version=14.18.1 --public-repo=False --script-version=3.11.0 diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml index 71e11d9bd3..3cedb93e59 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:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app @@ -18,7 +18,7 @@ services: user: node test_acceptance: - image: node:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app diff --git a/services/docstore/.nvmrc b/services/docstore/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/services/docstore/.nvmrc +++ b/services/docstore/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/services/docstore/Dockerfile b/services/docstore/Dockerfile index 20825d530c..f203639813 100644 --- a/services/docstore/Dockerfile +++ b/services/docstore/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -FROM node:12.22.7 as base +FROM node:14.18.1 as base WORKDIR /app diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt index b6cf03de37..dedbd2b208 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=12.22.7 +--node-version=14.18.1 --public-repo=True --script-version=3.11.0 diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml index 70a385be92..a80c5f5d47 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:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app @@ -18,7 +18,7 @@ services: user: node test_acceptance: - image: node:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app diff --git a/services/document-updater/.nvmrc b/services/document-updater/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/services/document-updater/.nvmrc +++ b/services/document-updater/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/services/document-updater/Dockerfile b/services/document-updater/Dockerfile index 20825d530c..f203639813 100644 --- a/services/document-updater/Dockerfile +++ b/services/document-updater/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -FROM node:12.22.7 as base +FROM node:14.18.1 as base WORKDIR /app diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt index dcdb3fc041..f19db09739 100644 --- a/services/document-updater/buildscript.txt +++ b/services/document-updater/buildscript.txt @@ -3,6 +3,6 @@ document-updater --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= ---node-version=12.22.7 +--node-version=14.18.1 --public-repo=True --script-version=3.11.0 diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml index b55f6b49e3..694aff43b7 100644 --- a/services/document-updater/docker-compose.yml +++ b/services/document-updater/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app @@ -18,7 +18,7 @@ services: user: node test_acceptance: - image: node:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app diff --git a/services/filestore/.nvmrc b/services/filestore/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/services/filestore/.nvmrc +++ b/services/filestore/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/services/filestore/Dockerfile b/services/filestore/Dockerfile index 692e815d4b..4a34a75366 100644 --- a/services/filestore/Dockerfile +++ b/services/filestore/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -FROM node:12.22.7 as base +FROM node:14.18.1 as base WORKDIR /app COPY install_deps.sh /app diff --git a/services/filestore/app/js/FileHandler.js b/services/filestore/app/js/FileHandler.js index e20aca2d37..f6446679d3 100644 --- a/services/filestore/app/js/FileHandler.js +++ b/services/filestore/app/js/FileHandler.js @@ -143,6 +143,9 @@ async function _getConvertedFileAndCache(bucket, key, convertedKey, opts) { // S3 provides eventual consistency for read-after-write."" // https://docs.aws.amazon.com/AmazonS3/latest/dev/Introduction.html#ConsistencyModel const readStream = fs.createReadStream(convertedFsPath) + readStream.on('error', function () { + LocalFileWriter.deleteFile(convertedFsPath, function () {}) + }) readStream.on('end', function () { LocalFileWriter.deleteFile(convertedFsPath, function () {}) }) diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index 06a9ab33ae..627768fc2a 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=12.22.7 +--node-version=14.18.1 --public-repo=True --script-version=3.11.0 diff --git a/services/notifications/.nvmrc b/services/notifications/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/services/notifications/.nvmrc +++ b/services/notifications/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile index 20825d530c..f203639813 100644 --- a/services/notifications/Dockerfile +++ b/services/notifications/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -FROM node:12.22.7 as base +FROM node:14.18.1 as base WORKDIR /app diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index a0c8e00ad1..754ef8aeb4 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=12.22.7 +--node-version=14.18.1 --public-repo=True --script-version=3.11.0 diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index 71e11d9bd3..3cedb93e59 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:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app @@ -18,7 +18,7 @@ services: user: node test_acceptance: - image: node:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app diff --git a/services/real-time/.nvmrc b/services/real-time/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/services/real-time/.nvmrc +++ b/services/real-time/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/services/real-time/Dockerfile b/services/real-time/Dockerfile index 20825d530c..f203639813 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/sharelatex/sharelatex-dev-environment -FROM node:12.22.7 as base +FROM node:14.18.1 as base WORKDIR /app diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 95bb41e58a..8f716697bc 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=12.22.7 +--node-version=14.18.1 --public-repo=True --script-version=3.11.0 diff --git a/services/real-time/docker-compose.yml b/services/real-time/docker-compose.yml index 7a183bd44d..2812df44a2 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:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app @@ -18,7 +18,7 @@ services: user: node test_acceptance: - image: node:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app diff --git a/services/spelling/.nvmrc b/services/spelling/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/services/spelling/.nvmrc +++ b/services/spelling/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/services/spelling/Dockerfile b/services/spelling/Dockerfile index 877b60a9c6..8753c136c2 100644 --- a/services/spelling/Dockerfile +++ b/services/spelling/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -FROM node:12.22.7 as base +FROM node:14.18.1 as base WORKDIR /app COPY install_deps.sh /app diff --git a/services/spelling/buildscript.txt b/services/spelling/buildscript.txt index 5d74efcfd7..d4b4700cfd 100644 --- a/services/spelling/buildscript.txt +++ b/services/spelling/buildscript.txt @@ -4,6 +4,6 @@ spelling --docker-repos=gcr.io/overleaf-ops --env-add= --env-pass-through= ---node-version=12.22.7 +--node-version=14.18.1 --public-repo=False --script-version=3.11.0 diff --git a/services/track-changes/.nvmrc b/services/track-changes/.nvmrc index d8ff873d1a..31102b28de 100644 --- a/services/track-changes/.nvmrc +++ b/services/track-changes/.nvmrc @@ -1 +1 @@ -12.22.7 +14.18.1 diff --git a/services/track-changes/Dockerfile b/services/track-changes/Dockerfile index 20825d530c..f203639813 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/sharelatex/sharelatex-dev-environment -FROM node:12.22.7 as base +FROM node:14.18.1 as base WORKDIR /app diff --git a/services/track-changes/buildscript.txt b/services/track-changes/buildscript.txt index 41a73c5b78..19a11be8a0 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=12.22.7 +--node-version=14.18.1 --public-repo=True --script-version=3.11.0 diff --git a/services/track-changes/docker-compose.yml b/services/track-changes/docker-compose.yml index 3b4591cf19..c56b44da03 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:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app @@ -18,7 +18,7 @@ services: user: node test_acceptance: - image: node:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app diff --git a/services/web/Dockerfile b/services/web/Dockerfile index c7a383223e..34ee6a4996 100644 --- a/services/web/Dockerfile +++ b/services/web/Dockerfile @@ -1,5 +1,5 @@ # the base image is suitable for running web with /app bind mounted -FROM node:12.22.7 as base +FROM node:14.18.1 as base WORKDIR /app diff --git a/services/web/Dockerfile.frontend b/services/web/Dockerfile.frontend index 54059fb62d..825533d4c2 100644 --- a/services/web/Dockerfile.frontend +++ b/services/web/Dockerfile.frontend @@ -1,4 +1,4 @@ -FROM node:12.22.7 +FROM node:14.18.1 # Install Google Chrome RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml index 9cbcc4efa8..9d6a00072d 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -21,7 +21,7 @@ services: user: node test_acceptance: - image: node:12.22.7 + image: node:14.18.1 volumes: - .:/app working_dir: /app diff --git a/services/web/scripts/translations/Dockerfile b/services/web/scripts/translations/Dockerfile index f75729b5d2..8c4734410a 100644 --- a/services/web/scripts/translations/Dockerfile +++ b/services/web/scripts/translations/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.22.7 +FROM node:14.18.1 WORKDIR /app/scripts/translations