diff --git a/services/history-v1/Dockerfile b/services/history-v1/Dockerfile index 73253eb9fc..25399c26df 100644 --- a/services/history-v1/Dockerfile +++ b/services/history-v1/Dockerfile @@ -2,7 +2,7 @@ # Instead run bin/update_build_scripts from # https://github.com/overleaf/internal/ -FROM node:16.17.1 as base +FROM gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 as base WORKDIR /overleaf/services/history-v1 diff --git a/services/history-v1/Makefile b/services/history-v1/Makefile index ae179680d8..ee34650375 100644 --- a/services/history-v1/Makefile +++ b/services/history-v1/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.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 npm run --silent format: $(RUN_LINTING) format diff --git a/services/history-v1/buildscript.txt b/services/history-v1/buildscript.txt index 6aa469dbf1..653d856bb9 100644 --- a/services/history-v1/buildscript.txt +++ b/services/history-v1/buildscript.txt @@ -5,6 +5,6 @@ history-v1 --env-pass-through= --esmock-loader=False --has-custom-nodemon=True ---node-version=16.17.1 +--node-version=gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 --public-repo=False --script-version=4.2.0 diff --git a/services/history-v1/docker-compose.yml b/services/history-v1/docker-compose.yml index fdc227642d..b94a832e9a 100644 --- a/services/history-v1/docker-compose.yml +++ b/services/history-v1/docker-compose.yml @@ -6,7 +6,7 @@ version: "2.3" services: test_unit: - image: node:16.17.1 + image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 volumes: - .:/overleaf/services/history-v1 - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:16.17.1 + image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 volumes: - .:/overleaf/services/history-v1 - ../../node_modules:/overleaf/node_modules diff --git a/services/real-time/Dockerfile b/services/real-time/Dockerfile index 84d352c652..7f2f6022aa 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:16.17.1 as base +FROM gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 as base WORKDIR /overleaf/services/real-time diff --git a/services/real-time/Makefile b/services/real-time/Makefile index b1a2d03328..12d56d6913 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.17.1 npm run --silent +RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 npm run --silent format: $(RUN_LINTING) format diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index c442c0564a..6c6210d3f9 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.17.1 +--node-version=gcr.io/overleaf-ops/nodejs-overleaf:16.20.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 62102fbe38..10bbe6609b 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.17.1 + image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 volumes: - .:/overleaf/services/real-time - ../../node_modules:/overleaf/node_modules @@ -20,7 +20,7 @@ services: user: node test_acceptance: - image: node:16.17.1 + image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 volumes: - .:/overleaf/services/real-time - ../../node_modules:/overleaf/node_modules diff --git a/services/web/Dockerfile b/services/web/Dockerfile index 4786ecf754..6ed6976a40 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.17.1 as base +FROM gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 as base WORKDIR /overleaf/services/web diff --git a/services/web/Dockerfile.frontend b/services/web/Dockerfile.frontend index d8ac84abd1..7728e6359c 100644 --- a/services/web/Dockerfile.frontend +++ b/services/web/Dockerfile.frontend @@ -1,4 +1,4 @@ -FROM node:16.17.1 +FROM gcr.io/overleaf-ops/nodejs-overleaf:16.20.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 8b0d186dac..bb2547c32a 100644 --- a/services/web/docker-compose.yml +++ b/services/web/docker-compose.yml @@ -6,7 +6,7 @@ volumes: services: test_unit: - image: node:16.17.1 + image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 volumes: - .:/overleaf/services/web - ../../node_modules:/overleaf/node_modules @@ -21,7 +21,7 @@ services: user: node test_acceptance: - image: node:16.17.1 + image: gcr.io/overleaf-ops/nodejs-overleaf:16.20.1 volumes: - .:/overleaf/services/web - ../../node_modules:/overleaf/node_modules