From e7531eb0475618ec8d44598333cbcfc9ebad54ae Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Fri, 15 Jul 2022 11:52:41 +0100 Subject: [PATCH] Merge pull request #8871 from overleaf/briangough-issue8868 Upgrade node to v16.16.0 GitOrigin-RevId: 6bc6d63aa4af1940649f1eb5966f182250ecac22 --- 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 +- services/chat/.nvmrc | 2 +- services/chat/Dockerfile | 2 +- services/chat/Makefile | 2 +- services/chat/buildscript.txt | 2 +- services/chat/docker-compose.yml | 4 ++-- services/clsi/.nvmrc | 2 +- services/clsi/Dockerfile | 4 ++-- services/clsi/Makefile | 2 +- services/clsi/buildscript.txt | 2 +- services/contacts/.nvmrc | 2 +- services/contacts/Dockerfile | 2 +- services/contacts/Makefile | 2 +- services/contacts/buildscript.txt | 2 +- services/contacts/docker-compose.yml | 4 ++-- services/docstore/.nvmrc | 2 +- services/docstore/Dockerfile | 2 +- services/docstore/Makefile | 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/Makefile | 2 +- services/document-updater/buildscript.txt | 2 +- services/document-updater/docker-compose.yml | 4 ++-- services/filestore/.nvmrc | 2 +- services/filestore/Dockerfile | 4 ++-- services/filestore/Makefile | 2 +- services/filestore/buildscript.txt | 2 +- services/notifications/.nvmrc | 2 +- services/notifications/Dockerfile | 2 +- services/notifications/Makefile | 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/Makefile | 2 +- services/real-time/buildscript.txt | 2 +- services/real-time/docker-compose.yml | 4 ++-- services/spelling/.nvmrc | 2 +- services/spelling/Dockerfile | 4 ++-- services/spelling/Makefile | 2 +- services/spelling/buildscript.txt | 2 +- services/track-changes/.nvmrc | 2 +- services/track-changes/Dockerfile | 2 +- services/track-changes/Makefile | 2 +- services/track-changes/buildscript.txt | 2 +- services/track-changes/docker-compose.yml | 4 ++-- services/web/.nvmrc | 2 +- services/web/Dockerfile | 16 ++++++++-------- services/web/Dockerfile.frontend | 2 +- services/web/docker-compose.yml | 4 ++-- services/web/scripts/translations/Dockerfile | 2 +- 66 files changed, 84 insertions(+), 84 deletions(-) diff --git a/libraries/access-token-encryptor/.nvmrc b/libraries/access-token-encryptor/.nvmrc index d9f880069d..431076a948 100644 --- a/libraries/access-token-encryptor/.nvmrc +++ b/libraries/access-token-encryptor/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/libraries/access-token-encryptor/buildscript.txt b/libraries/access-token-encryptor/buildscript.txt index 1d82d3537f..8dc163441f 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=16.14.2 +--node-version=16.16.0 --public-repo=False --script-version=4.1.0 diff --git a/libraries/logger/.nvmrc b/libraries/logger/.nvmrc index d9f880069d..431076a948 100644 --- a/libraries/logger/.nvmrc +++ b/libraries/logger/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/libraries/logger/buildscript.txt b/libraries/logger/buildscript.txt index 6ce762d6b4..6f0aeba9e7 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=16.14.2 +--node-version=16.16.0 --public-repo=False --script-version=4.1.0 diff --git a/libraries/metrics/.nvmrc b/libraries/metrics/.nvmrc index d9f880069d..431076a948 100644 --- a/libraries/metrics/.nvmrc +++ b/libraries/metrics/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/libraries/metrics/buildscript.txt b/libraries/metrics/buildscript.txt index d06cdd68f1..73db510716 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=16.14.2 +--node-version=16.16.0 --public-repo=False --script-version=4.1.0 diff --git a/libraries/o-error/.nvmrc b/libraries/o-error/.nvmrc index d9f880069d..431076a948 100644 --- a/libraries/o-error/.nvmrc +++ b/libraries/o-error/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/libraries/o-error/buildscript.txt b/libraries/o-error/buildscript.txt index db6c598a6c..b7ad1273a4 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=16.14.2 +--node-version=16.16.0 --public-repo=False --script-version=4.1.0 diff --git a/libraries/object-persistor/.nvmrc b/libraries/object-persistor/.nvmrc index d9f880069d..431076a948 100644 --- a/libraries/object-persistor/.nvmrc +++ b/libraries/object-persistor/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/libraries/object-persistor/buildscript.txt b/libraries/object-persistor/buildscript.txt index c360c6bd81..446b9ccbf0 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=16.14.2 +--node-version=16.16.0 --public-repo=False --script-version=4.1.0 diff --git a/libraries/redis-wrapper/.nvmrc b/libraries/redis-wrapper/.nvmrc index d9f880069d..431076a948 100644 --- a/libraries/redis-wrapper/.nvmrc +++ b/libraries/redis-wrapper/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/libraries/redis-wrapper/buildscript.txt b/libraries/redis-wrapper/buildscript.txt index 35e9fba8a8..ed294fc8d1 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=16.14.2 +--node-version=16.16.0 --public-repo=False --script-version=4.1.0 diff --git a/libraries/settings/.nvmrc b/libraries/settings/.nvmrc index d9f880069d..431076a948 100644 --- a/libraries/settings/.nvmrc +++ b/libraries/settings/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/libraries/settings/buildscript.txt b/libraries/settings/buildscript.txt index 28d91cffd4..7961c1b3be 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=16.14.2 +--node-version=16.16.0 --public-repo=False --script-version=4.1.0 diff --git a/services/chat/.nvmrc b/services/chat/.nvmrc index d9f880069d..431076a948 100644 --- a/services/chat/.nvmrc +++ b/services/chat/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/services/chat/Dockerfile b/services/chat/Dockerfile index b9cc7f6a51..1c6e1660f9 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:16.14.2 as base +FROM node:16.16.0 as base WORKDIR /overleaf/services/chat diff --git a/services/chat/Makefile b/services/chat/Makefile index 3f4d55c0b9..7f3b981469 100644 --- a/services/chat/Makefile +++ b/services/chat/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.16.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/chat/buildscript.txt b/services/chat/buildscript.txt index 65b2b1613c..4de6f63536 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=16.14.2 +--node-version=16.16.0 --public-repo=False --script-version=4.1.0 diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml index 590f14fb77..e67a390534 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:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/chat - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/chat - ../../node_modules:/overleaf/node_modules diff --git a/services/clsi/.nvmrc b/services/clsi/.nvmrc index d9f880069d..431076a948 100644 --- a/services/clsi/.nvmrc +++ b/services/clsi/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/services/clsi/Dockerfile b/services/clsi/Dockerfile index c09324ed35..b529dee0bd 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:16.14.2 as base +FROM node:16.16.0 as base WORKDIR /overleaf/services/clsi COPY services/clsi/install_deps.sh /overleaf/services/clsi/ @@ -26,6 +26,6 @@ COPY services/clsi/ /overleaf/services/clsi/ FROM app RUN mkdir -p cache compiles output \ -&& chown node:node cache compiles output + && chown node:node cache compiles output CMD ["node", "--expose-gc", "app.js"] diff --git a/services/clsi/Makefile b/services/clsi/Makefile index 876c8fbc62..2d52ba86e9 100644 --- a/services/clsi/Makefile +++ b/services/clsi/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.16.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt index edd1bad3f3..9163b9a54d 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=16.14.2 +--node-version=16.16.0 --public-repo=True --script-version=4.1.0 diff --git a/services/contacts/.nvmrc b/services/contacts/.nvmrc index d9f880069d..431076a948 100644 --- a/services/contacts/.nvmrc +++ b/services/contacts/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/services/contacts/Dockerfile b/services/contacts/Dockerfile index 1bf436b430..ab44f56017 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:16.14.2 as base +FROM node:16.16.0 as base WORKDIR /overleaf/services/contacts diff --git a/services/contacts/Makefile b/services/contacts/Makefile index 4f89afb502..3d41e7259b 100644 --- a/services/contacts/Makefile +++ b/services/contacts/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.16.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/contacts/buildscript.txt b/services/contacts/buildscript.txt index e0f883f9b3..073726722e 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=16.14.2 +--node-version=16.16.0 --public-repo=False --script-version=4.1.0 diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml index 7ced69a758..47aa25e7aa 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:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/contacts - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/contacts - ../../node_modules:/overleaf/node_modules diff --git a/services/docstore/.nvmrc b/services/docstore/.nvmrc index d9f880069d..431076a948 100644 --- a/services/docstore/.nvmrc +++ b/services/docstore/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/services/docstore/Dockerfile b/services/docstore/Dockerfile index dca56dff24..e0e2de376b 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:16.14.2 as base +FROM node:16.16.0 as base WORKDIR /overleaf/services/docstore diff --git a/services/docstore/Makefile b/services/docstore/Makefile index 246b4b5101..cf0ef1d8a2 100644 --- a/services/docstore/Makefile +++ b/services/docstore/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.16.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt index 85c0e4bc07..c5346c3710 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=16.14.2 +--node-version=16.16.0 --public-repo=True --script-version=4.1.0 diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml index 877f233885..5a6df54c60 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:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/docstore - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/docstore - ../../node_modules:/overleaf/node_modules diff --git a/services/document-updater/.nvmrc b/services/document-updater/.nvmrc index d9f880069d..431076a948 100644 --- a/services/document-updater/.nvmrc +++ b/services/document-updater/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/services/document-updater/Dockerfile b/services/document-updater/Dockerfile index 96919d919a..85ba919203 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:16.14.2 as base +FROM node:16.16.0 as base WORKDIR /overleaf/services/document-updater diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile index 8e61e2a70c..eed7e08aa9 100644 --- a/services/document-updater/Makefile +++ b/services/document-updater/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.16.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt index fc0cae570c..25ffcd4cfc 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=16.14.2 +--node-version=16.16.0 --public-repo=True --script-version=4.1.0 diff --git a/services/document-updater/docker-compose.yml b/services/document-updater/docker-compose.yml index 3f4995c28c..aa7e4e2727 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:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/document-updater - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/document-updater - ../../node_modules:/overleaf/node_modules diff --git a/services/filestore/.nvmrc b/services/filestore/.nvmrc index d9f880069d..431076a948 100644 --- a/services/filestore/.nvmrc +++ b/services/filestore/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/services/filestore/Dockerfile b/services/filestore/Dockerfile index 70d65cd190..bd41a39db1 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:16.14.2 as base +FROM node:16.16.0 as base WORKDIR /overleaf/services/filestore COPY services/filestore/install_deps.sh /overleaf/services/filestore/ @@ -24,7 +24,7 @@ COPY services/filestore/ /overleaf/services/filestore/ FROM app RUN mkdir -p uploads user_files template_files \ -&& chown node:node uploads user_files template_files + && chown node:node uploads user_files template_files USER node CMD ["node", "--expose-gc", "app.js"] diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 939b330922..a106758fe6 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.16.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index d13d125897..b90bb7df33 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=16.14.2 +--node-version=16.16.0 --public-repo=True --script-version=4.1.0 diff --git a/services/notifications/.nvmrc b/services/notifications/.nvmrc index d9f880069d..431076a948 100644 --- a/services/notifications/.nvmrc +++ b/services/notifications/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile index b7c0ead6ea..9cf5e72caa 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:16.14.2 as base +FROM node:16.16.0 as base WORKDIR /overleaf/services/notifications diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 4a8a625d1f..3a85f36793 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.16.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index 45a91611bd..d71285251b 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=16.14.2 +--node-version=16.16.0 --public-repo=True --script-version=4.1.0 diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index 2fb3afab9d..745a24c842 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:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/notifications - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/notifications - ../../node_modules:/overleaf/node_modules diff --git a/services/real-time/.nvmrc b/services/real-time/.nvmrc index d9f880069d..431076a948 100644 --- a/services/real-time/.nvmrc +++ b/services/real-time/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/services/real-time/Dockerfile b/services/real-time/Dockerfile index 94c589dea2..e0b452a329 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:16.14.2 as base +FROM node:16.16.0 as base WORKDIR /overleaf/services/real-time diff --git a/services/real-time/Makefile b/services/real-time/Makefile index 05333b3b4b..8b6e0356ee 100644 --- a/services/real-time/Makefile +++ b/services/real-time/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.16.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 3ad7113b41..d3a09a38c3 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=16.14.2 +--node-version=16.16.0 --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 979d9df408..688626be4b 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:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/real-time - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/real-time - ../../node_modules:/overleaf/node_modules diff --git a/services/spelling/.nvmrc b/services/spelling/.nvmrc index d9f880069d..431076a948 100644 --- a/services/spelling/.nvmrc +++ b/services/spelling/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/services/spelling/Dockerfile b/services/spelling/Dockerfile index 3a2268800d..ee14517506 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:16.14.2 as base +FROM node:16.16.0 as base WORKDIR /overleaf/services/spelling COPY services/spelling/install_deps.sh /overleaf/services/spelling/ @@ -24,7 +24,7 @@ COPY services/spelling/ /overleaf/services/spelling/ FROM app RUN mkdir -p cache \ -&& chown node:node cache + && chown node:node cache USER node CMD ["node", "--expose-gc", "app.js"] diff --git a/services/spelling/Makefile b/services/spelling/Makefile index db6411fa4c..4f3c23ad93 100644 --- a/services/spelling/Makefile +++ b/services/spelling/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.16.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/spelling/buildscript.txt b/services/spelling/buildscript.txt index 7043696cda..076f9fcf1a 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=16.14.2 +--node-version=16.16.0 --public-repo=False --script-version=4.1.0 diff --git a/services/track-changes/.nvmrc b/services/track-changes/.nvmrc index d9f880069d..431076a948 100644 --- a/services/track-changes/.nvmrc +++ b/services/track-changes/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/services/track-changes/Dockerfile b/services/track-changes/Dockerfile index e63a6eab66..375235872d 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:16.14.2 as base +FROM node:16.16.0 as base WORKDIR /overleaf/services/track-changes diff --git a/services/track-changes/Makefile b/services/track-changes/Makefile index 3bb89dba6c..99b4a30593 100644 --- a/services/track-changes/Makefile +++ b/services/track-changes/Makefile @@ -30,7 +30,7 @@ HERE=$(shell pwd) MONOREPO=$(shell cd ../../ && pwd) # Run the linting commands in the scope of the monorepo. # Eslint and prettier (plus some configs) are on the root. -RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.16.0 npm run --silent format: $(RUN_LINTING) format diff --git a/services/track-changes/buildscript.txt b/services/track-changes/buildscript.txt index 29a7d32576..083286232f 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=16.14.2 +--node-version=16.16.0 --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 3c19f637a5..2028d9c0b1 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:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/track-changes - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/track-changes - ../../node_modules:/overleaf/node_modules diff --git a/services/web/.nvmrc b/services/web/.nvmrc index d9f880069d..431076a948 100644 --- a/services/web/.nvmrc +++ b/services/web/.nvmrc @@ -1 +1 @@ -16.14.2 +16.16.0 diff --git a/services/web/Dockerfile b/services/web/Dockerfile index 94850a8ab6..421c4c11c3 100644 --- a/services/web/Dockerfile +++ b/services/web/Dockerfile @@ -1,6 +1,6 @@ # the base image is suitable for running web with /overleaf/services/web bind # mounted -FROM node:16.14.2 as base +FROM node:16.16.0 as base WORKDIR /overleaf/services/web @@ -33,13 +33,13 @@ COPY services/web /overleaf/services/web RUN cd /overleaf/services/web && npm run 'lezer-latex:generate' RUN mkdir -p /overleaf/services/web/data/dumpFolder \ -&& mkdir -p /overleaf/services/web/data/logs \ -&& mkdir -p /overleaf/services/web/data/pdf \ -&& mkdir -p /overleaf/services/web/data/uploads \ -&& mkdir -p /overleaf/services/web/data/zippedProjects \ -&& mkdir -p /overleaf/services/web/data/projectHistories \ -&& chmod -R 0755 /overleaf/services/web/data \ -&& chown -R node:node /overleaf/services/web/data + && mkdir -p /overleaf/services/web/data/logs \ + && mkdir -p /overleaf/services/web/data/pdf \ + && mkdir -p /overleaf/services/web/data/uploads \ + && mkdir -p /overleaf/services/web/data/zippedProjects \ + && mkdir -p /overleaf/services/web/data/projectHistories \ + && chmod -R 0755 /overleaf/services/web/data \ + && chown -R node:node /overleaf/services/web/data ARG SENTRY_RELEASE ENV SENTRY_RELEASE=$SENTRY_RELEASE diff --git a/services/web/Dockerfile.frontend b/services/web/Dockerfile.frontend index 7d0fd9b174..0fa6893b4f 100644 --- a/services/web/Dockerfile.frontend +++ b/services/web/Dockerfile.frontend @@ -1,4 +1,4 @@ -FROM node:16.14.2 +FROM node:16.16.0 # 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 8301750553..1417c63b71 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -6,7 +6,7 @@ volumes: services: test_unit: - image: node:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/web - ../../node_modules:/overleaf/node_modules @@ -21,7 +21,7 @@ services: user: node test_acceptance: - image: node:16.14.2 + image: node:16.16.0 volumes: - .:/overleaf/services/web - ../../node_modules:/overleaf/node_modules diff --git a/services/web/scripts/translations/Dockerfile b/services/web/scripts/translations/Dockerfile index c9bcfbcc91..9f6070e665 100644 --- a/services/web/scripts/translations/Dockerfile +++ b/services/web/scripts/translations/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16.14.2 +FROM node:16.16.0 WORKDIR /app/scripts/translations