From 3eca5053191c017eb65ec2958df17060f40a5ded Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <eric.mcsween@overleaf.com>
Date: Fri, 12 Mar 2021 15:00:19 -0500
Subject: [PATCH] Upgrade to Node 12

---
 services/clsi/.dockerignore   | 1 +
 services/clsi/.nvmrc          | 2 +-
 services/clsi/Dockerfile      | 4 ++--
 services/clsi/Makefile        | 6 ++++--
 services/clsi/buildscript.txt | 6 +++---
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/services/clsi/.dockerignore b/services/clsi/.dockerignore
index 74fdc35e80..bcbd758418 100644
--- a/services/clsi/.dockerignore
+++ b/services/clsi/.dockerignore
@@ -8,3 +8,4 @@ nodemon.json
 cache/
 compiles/
 db/
+output/
diff --git a/services/clsi/.nvmrc b/services/clsi/.nvmrc
index 2baa2d433a..e68b860383 100644
--- a/services/clsi/.nvmrc
+++ b/services/clsi/.nvmrc
@@ -1 +1 @@
-10.23.1
+12.21.0
diff --git a/services/clsi/Dockerfile b/services/clsi/Dockerfile
index 7eaa03f814..b02e828a4d 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:10.23.1 as base
+FROM node:12.21.0 as base
 
 WORKDIR /app
 COPY install_deps.sh /app
@@ -23,6 +23,6 @@ FROM base
 
 COPY --from=app /app /app
 RUN mkdir -p cache compiles db output \
-  &&  chown node:node cache compiles db output
+&&  chown node:node cache compiles db output
 
 CMD ["node", "--expose-gc", "app.js"]
diff --git a/services/clsi/Makefile b/services/clsi/Makefile
index 040a9315e3..45a4bc0400 100644
--- a/services/clsi/Makefile
+++ b/services/clsi/Makefile
@@ -21,8 +21,10 @@ DOCKER_COMPOSE_TEST_UNIT = \
 	COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE)
 
 clean:
-	docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
-	docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	-$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local
+	-$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local
 
 format:
 	$(DOCKER_COMPOSE) run --rm test_unit npm run --silent format
diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt
index b2093150c1..a86911dc61 100644
--- a/services/clsi/buildscript.txt
+++ b/services/clsi/buildscript.txt
@@ -1,9 +1,9 @@
 clsi
---data-dirs=cache,compiles,db
+--data-dirs=cache,compiles,db,output
 --dependencies=
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=TEXLIVE_IMAGE
---node-version=10.23.1
+--node-version=12.21.0
 --public-repo=True
---script-version=3.4.0
+--script-version=3.7.0