From 372ccb3a2b67482c9be68c886324c9b24a81c7b5 Mon Sep 17 00:00:00 2001
From: Brian Gough <brian.gough@overleaf.com>
Date: Wed, 3 Jun 2020 10:22:39 +0100
Subject: [PATCH 1/3] update to node 10.21.0

---
 services/contacts/.nvmrc             | 2 +-
 services/contacts/Dockerfile         | 2 +-
 services/contacts/docker-compose.yml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/contacts/.nvmrc b/services/contacts/.nvmrc
index 5b7269c0a9..b61c07ffdd 100644
--- a/services/contacts/.nvmrc
+++ b/services/contacts/.nvmrc
@@ -1 +1 @@
-10.19.0
+10.21.0
diff --git a/services/contacts/Dockerfile b/services/contacts/Dockerfile
index c014691791..7b47fb9ee2 100644
--- a/services/contacts/Dockerfile
+++ b/services/contacts/Dockerfile
@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/sharelatex/sharelatex-dev-environment
 
-FROM node:10.19.0 as base
+FROM node:10.21.0 as base
 
 WORKDIR /app
 
diff --git a/services/contacts/docker-compose.yml b/services/contacts/docker-compose.yml
index 09dbaf76ba..528fb5e77f 100644
--- a/services/contacts/docker-compose.yml
+++ b/services/contacts/docker-compose.yml
@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:10.19.0
+    image: node:10.21.0
     volumes:
       - .:/app
     working_dir: /app
@@ -17,7 +17,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:10.19.0
+    image: node:10.21.0
     volumes:
       - .:/app
     working_dir: /app

From ed82adb59bf3c1bb0297ec461c341abfb555e13c Mon Sep 17 00:00:00 2001
From: Brian Gough <brian.gough@overleaf.com>
Date: Wed, 3 Jun 2020 11:11:57 +0100
Subject: [PATCH 2/3] update buildscript.txt to node 10.21.0

---
 services/contacts/buildscript.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/contacts/buildscript.txt b/services/contacts/buildscript.txt
index 45f8590a8a..6548a2755a 100644
--- a/services/contacts/buildscript.txt
+++ b/services/contacts/buildscript.txt
@@ -5,6 +5,6 @@ contacts
 --env-add=
 --env-pass-through=
 --language=es
---node-version=10.19.0
+--node-version=10.21.0
 --public-repo=False
 --script-version=2.0.0

From 96a083571028ca4e05fbd19d4764cd5ff5038adf Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Wed, 3 Jun 2020 11:32:09 +0100
Subject: [PATCH 3/3] [misc] make: ignore a lint/format task failure

---
 services/contacts/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/contacts/Makefile b/services/contacts/Makefile
index 7e0b5418ea..528bf7b0bd 100644
--- a/services/contacts/Makefile
+++ b/services/contacts/Makefile
@@ -17,13 +17,13 @@ clean:
 	docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 
 format:
-	$(DOCKER_COMPOSE) run --rm test_unit npm run format
+	$(DOCKER_COMPOSE) run --rm test_unit npm run format || true
 
 format_fix:
 	$(DOCKER_COMPOSE) run --rm test_unit npm run format:fix
 
 lint:
-	$(DOCKER_COMPOSE) run --rm test_unit npm run lint
+	$(DOCKER_COMPOSE) run --rm test_unit npm run lint || true
 
 test: format lint test_unit test_acceptance