From 8b6f1f5750c4fca3cc347040e9ee2e0812436620 Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <eric.mcsween@overleaf.com>
Date: Fri, 12 Mar 2021 14:44:55 -0500
Subject: [PATCH] Upgrade to Node 12

---
 services/chat/.nvmrc             | 2 +-
 services/chat/Dockerfile         | 2 +-
 services/chat/Makefile           | 6 ++++--
 services/chat/buildscript.txt    | 4 ++--
 services/chat/docker-compose.yml | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/services/chat/.nvmrc b/services/chat/.nvmrc
index 2baa2d433a..e68b860383 100644
--- a/services/chat/.nvmrc
+++ b/services/chat/.nvmrc
@@ -1 +1 @@
-10.23.1
+12.21.0
diff --git a/services/chat/Dockerfile b/services/chat/Dockerfile
index 2da67d2436..4f417a2a4b 100644
--- a/services/chat/Dockerfile
+++ b/services/chat/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
 
diff --git a/services/chat/Makefile b/services/chat/Makefile
index 129653cc13..46b4578b0d 100644
--- a/services/chat/Makefile
+++ b/services/chat/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/chat/buildscript.txt b/services/chat/buildscript.txt
index 1c4e21f088..798f58f99e 100644
--- a/services/chat/buildscript.txt
+++ b/services/chat/buildscript.txt
@@ -3,6 +3,6 @@ chat
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
---node-version=10.23.1
+--node-version=12.21.0
 --public-repo=False
---script-version=3.4.0
+--script-version=3.7.0
diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml
index 8be027dba1..1a8d6095ee 100644
--- a/services/chat/docker-compose.yml
+++ b/services/chat/docker-compose.yml
@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:10.23.1
+    image: node:12.21.0
     volumes:
       - .:/app
     working_dir: /app
@@ -18,7 +18,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:10.23.1
+    image: node:12.21.0
     volumes:
       - .:/app
     working_dir: /app