github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13539 from overleaf/jpa-node-16-20-1

Browse source 
[misc] upgrade nodejs from 16.17.1 to 16.20.1 in user facing services

GitOrigin-RevId: c338b0c0d43ba26294007b6674822cc0a1e28bbc
This commit is contained in:
Jakob Ackermann 2023-06-21 11:55:50 +01:00 committed by Copybot
parent 8cca5d3316
commit 49c2fee3ba
11 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/history-v1/Dockerfile
View file

@ -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

2
services/history-v1/Makefile
View file

@ -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

2
services/history-v1/buildscript.txt
View file

@ -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

4
services/history-v1/docker-compose.yml
View file

@ -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

2
services/real-time/Dockerfile
View file

@ -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

2
services/real-time/Makefile
View file

@ -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

2
services/real-time/buildscript.txt
View file

@ -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

4
services/real-time/docker-compose.yml
View file

@ -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

2
services/web/Dockerfile
View file

@ -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

2
services/web/Dockerfile.frontend
View file

@ -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 -

4
services/web/docker-compose.yml
View file

@ -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