Browse Source

Merge pull request #5705 from overleaf/jpa-node-14

[misc] upgrade node version from 12 to 14

GitOrigin-RevId: 15c465c7bb5e42b0c71e2dedb09cf4fe9f1d8ec6
Jakob Ackermann 4 years ago
parent
commit
2261e761f4
57 changed files with 67 additions and 64 deletions
  1. 1 1
      libraries/access-token-encryptor/.nvmrc
  2. 1 1
      libraries/access-token-encryptor/buildscript.txt
  3. 1 1
      libraries/logger/.nvmrc
  4. 1 1
      libraries/logger/buildscript.txt
  5. 1 1
      libraries/metrics/.nvmrc
  6. 1 1
      libraries/metrics/buildscript.txt
  7. 1 1
      libraries/o-error/.nvmrc
  8. 1 1
      libraries/o-error/buildscript.txt
  9. 1 1
      libraries/object-persistor/.nvmrc
  10. 1 1
      libraries/object-persistor/buildscript.txt
  11. 1 1
      libraries/redis-wrapper/.nvmrc
  12. 1 1
      libraries/redis-wrapper/buildscript.txt
  13. 1 1
      libraries/settings/.nvmrc
  14. 1 1
      libraries/settings/buildscript.txt
  15. 2 2
      server-ce/Dockerfile-base
  16. 1 1
      services/chat/.nvmrc
  17. 1 1
      services/chat/Dockerfile
  18. 1 1
      services/chat/buildscript.txt
  19. 2 2
      services/chat/docker-compose.yml
  20. 1 1
      services/clsi/.nvmrc
  21. 1 1
      services/clsi/Dockerfile
  22. 1 1
      services/clsi/buildscript.txt
  23. 1 1
      services/contacts/.nvmrc
  24. 1 1
      services/contacts/Dockerfile
  25. 1 1
      services/contacts/buildscript.txt
  26. 2 2
      services/contacts/docker-compose.yml
  27. 1 1
      services/docstore/.nvmrc
  28. 1 1
      services/docstore/Dockerfile
  29. 1 1
      services/docstore/buildscript.txt
  30. 2 2
      services/docstore/docker-compose.yml
  31. 1 1
      services/document-updater/.nvmrc
  32. 1 1
      services/document-updater/Dockerfile
  33. 1 1
      services/document-updater/buildscript.txt
  34. 2 2
      services/document-updater/docker-compose.yml
  35. 1 1
      services/filestore/.nvmrc
  36. 1 1
      services/filestore/Dockerfile
  37. 3 0
      services/filestore/app/js/FileHandler.js
  38. 1 1
      services/filestore/buildscript.txt
  39. 1 1
      services/notifications/.nvmrc
  40. 1 1
      services/notifications/Dockerfile
  41. 1 1
      services/notifications/buildscript.txt
  42. 2 2
      services/notifications/docker-compose.yml
  43. 1 1
      services/real-time/.nvmrc
  44. 1 1
      services/real-time/Dockerfile
  45. 1 1
      services/real-time/buildscript.txt
  46. 2 2
      services/real-time/docker-compose.yml
  47. 1 1
      services/spelling/.nvmrc
  48. 1 1
      services/spelling/Dockerfile
  49. 1 1
      services/spelling/buildscript.txt
  50. 1 1
      services/track-changes/.nvmrc
  51. 1 1
      services/track-changes/Dockerfile
  52. 1 1
      services/track-changes/buildscript.txt
  53. 2 2
      services/track-changes/docker-compose.yml
  54. 1 1
      services/web/Dockerfile
  55. 1 1
      services/web/Dockerfile.frontend
  56. 1 1
      services/web/docker-compose.yml
  57. 1 1
      services/web/scripts/translations/Dockerfile

+ 1 - 1
libraries/access-token-encryptor/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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

+ 1 - 1
libraries/logger/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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

+ 1 - 1
libraries/metrics/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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

+ 1 - 1
libraries/o-error/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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

+ 1 - 1
libraries/object-persistor/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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

+ 1 - 1
libraries/redis-wrapper/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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

+ 1 - 1
libraries/settings/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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

+ 2 - 2
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 \

+ 1 - 1
services/chat/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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
 

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/clsi/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
services/contacts/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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
 

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/docstore/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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
 

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/document-updater/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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
 

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/filestore/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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

+ 3 - 0
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 () {})
   })

+ 1 - 1
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

+ 1 - 1
services/notifications/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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
 

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/real-time/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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
 

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
services/spelling/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
services/track-changes/.nvmrc

@@ -1 +1 @@
-12.22.7
+14.18.1

+ 1 - 1
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
 

+ 1 - 1
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

+ 2 - 2
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

+ 1 - 1
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
 

+ 1 - 1
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 -

+ 1 - 1
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

+ 1 - 1
services/web/scripts/translations/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.22.7
+FROM node:14.18.1
 
 WORKDIR /app/scripts/translations