Просмотр исходного кода

Merge pull request #7403 from overleaf/em-node-16-docstore

Upgrade docstore to Node 16

GitOrigin-RevId: 37208f5f19ff5a8b98b787e392131d1ed02dfa2a
Eric Mc Sween 4 лет назад
Родитель
Сommit
47b9c6fe82

+ 1 - 1
services/docstore/.nvmrc

@@ -1 +1 @@
-14.18.3
+16.14.2

+ 1 - 1
services/docstore/Dockerfile

@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
 # https://github.com/sharelatex/sharelatex-dev-environment
 
 
-FROM gcr.io/overleaf-ops/node:14.18.3 as base
+FROM node:16.14.2 as base
 
 
 WORKDIR /overleaf/services/docstore
 WORKDIR /overleaf/services/docstore
 
 

+ 1 - 1
services/docstore/Makefile

@@ -30,7 +30,7 @@ HERE=$(shell pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 MONOREPO=$(shell cd ../../ && pwd)
 # Run the linting commands in the scope of the monorepo.
 # Run the linting commands in the scope of the monorepo.
 # Eslint and prettier (plus some configs) are on the root.
 # Eslint and prettier (plus some configs) are on the root.
-RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) gcr.io/overleaf-ops/node:14.18.3 npm run --silent
+RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent
 
 
 format:
 format:
 	$(RUN_LINTING) format
 	$(RUN_LINTING) format

+ 1 - 2
services/docstore/buildscript.txt

@@ -3,7 +3,6 @@ docstore
 --docker-repos=gcr.io/overleaf-ops
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-add=
 --env-pass-through=
 --env-pass-through=
---node-image=gcr.io/overleaf-ops/node
---node-version=14.18.3
+--node-version=16.14.2
 --public-repo=True
 --public-repo=True
 --script-version=4.1.0
 --script-version=4.1.0

+ 2 - 2
services/docstore/docker-compose.yml

@@ -6,7 +6,7 @@ version: "2.3"
 
 
 services:
 services:
   test_unit:
   test_unit:
-    image: gcr.io/overleaf-ops/node:14.18.3
+    image: node:16.14.2
     volumes:
     volumes:
       - .:/overleaf/services/docstore
       - .:/overleaf/services/docstore
       - ../../node_modules:/overleaf/node_modules
       - ../../node_modules:/overleaf/node_modules
@@ -20,7 +20,7 @@ services:
     user: node
     user: node
 
 
   test_acceptance:
   test_acceptance:
-    image: gcr.io/overleaf-ops/node:14.18.3
+    image: node:16.14.2
     volumes:
     volumes:
       - .:/overleaf/services/docstore
       - .:/overleaf/services/docstore
       - ../../node_modules:/overleaf/node_modules
       - ../../node_modules:/overleaf/node_modules