From 51b42381bdda820dba5e783eff37290eed795acb Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Fri, 22 Oct 2021 14:20:58 +0100 Subject: [PATCH] Merge pull request #5551 from overleaf/bg-node-upgrade-user-facing upgrade node to v12.22.7 (user facing) GitOrigin-RevId: ddc6a29beac27fe1ae5d88830fb901667d91ec89 --- 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/web/.nvmrc | 2 +- services/web/Dockerfile | 2 +- services/web/Dockerfile.frontend | 2 +- services/web/docker-compose.yml | 2 +- services/web/scripts/translations/Dockerfile | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/services/real-time/.nvmrc b/services/real-time/.nvmrc index 5a80a7e912..d8ff873d1a 100644 --- a/services/real-time/.nvmrc +++ b/services/real-time/.nvmrc @@ -1 +1 @@ -12.22.3 +12.22.7 diff --git a/services/real-time/Dockerfile b/services/real-time/Dockerfile index 6b286376dc..20825d530c 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.3 as base +FROM node:12.22.7 as base WORKDIR /app diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index fcf340d99c..95bb41e58a 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.3 +--node-version=12.22.7 --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 59ad1c5efe..7a183bd44d 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.3 + image: node:12.22.7 volumes: - .:/app working_dir: /app @@ -18,7 +18,7 @@ services: user: node test_acceptance: - image: node:12.22.3 + image: node:12.22.7 volumes: - .:/app working_dir: /app diff --git a/services/spelling/.nvmrc b/services/spelling/.nvmrc index 5a80a7e912..d8ff873d1a 100644 --- a/services/spelling/.nvmrc +++ b/services/spelling/.nvmrc @@ -1 +1 @@ -12.22.3 +12.22.7 diff --git a/services/spelling/Dockerfile b/services/spelling/Dockerfile index cf5fd51e57..877b60a9c6 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.3 as base +FROM node:12.22.7 as base WORKDIR /app COPY install_deps.sh /app diff --git a/services/spelling/buildscript.txt b/services/spelling/buildscript.txt index 7587d33a33..5d74efcfd7 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.3 +--node-version=12.22.7 --public-repo=False --script-version=3.11.0 diff --git a/services/web/.nvmrc b/services/web/.nvmrc index 5a80a7e912..d8ff873d1a 100644 --- a/services/web/.nvmrc +++ b/services/web/.nvmrc @@ -1 +1 @@ -12.22.3 +12.22.7 diff --git a/services/web/Dockerfile b/services/web/Dockerfile index 082ef79957..651d014997 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.3 as base +FROM node:12.22.7 as base WORKDIR /app diff --git a/services/web/Dockerfile.frontend b/services/web/Dockerfile.frontend index 80a2069b71..54059fb62d 100644 --- a/services/web/Dockerfile.frontend +++ b/services/web/Dockerfile.frontend @@ -1,4 +1,4 @@ -FROM node:12.22.3 +FROM node:12.22.7 # 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 45c59b1d97..9cbcc4efa8 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.3 + image: node:12.22.7 volumes: - .:/app working_dir: /app diff --git a/services/web/scripts/translations/Dockerfile b/services/web/scripts/translations/Dockerfile index 38a114c5aa..f75729b5d2 100644 --- a/services/web/scripts/translations/Dockerfile +++ b/services/web/scripts/translations/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.22.3 +FROM node:12.22.7 WORKDIR /app/scripts/translations