From cb8992e912f4e4752a38954cb9303c7e7c46f16f Mon Sep 17 00:00:00 2001
From: Brian Gough <briangough@users.noreply.github.com>
Date: Wed, 19 Apr 2023 17:44:15 +0100
Subject: [PATCH] Merge pull request #12709 from
 overleaf/bg-rollback-additional-services

rollback additional services from node 18 to 16

GitOrigin-RevId: 60428768eb4c895b89e9a5dace429ea70af3b9bf
---
 services/web/.nvmrc                          | 2 +-
 services/web/Dockerfile                      | 2 +-
 services/web/Dockerfile.frontend             | 2 +-
 services/web/docker-compose.common.env       | 2 +-
 services/web/docker-compose.yml              | 4 ++--
 services/web/scripts/translations/Dockerfile | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/services/web/.nvmrc b/services/web/.nvmrc
index 6d80269a4f..c85fa1bbef 100644
--- a/services/web/.nvmrc
+++ b/services/web/.nvmrc
@@ -1 +1 @@
-18.16.0
+16.17.1
diff --git a/services/web/Dockerfile b/services/web/Dockerfile
index db93992303..4786ecf754 100644
--- a/services/web/Dockerfile
+++ b/services/web/Dockerfile
@@ -1,6 +1,6 @@
 # the base image is suitable for running web with /overleaf/services/web bind
 # mounted
-FROM node:18.16.0 as base
+FROM node:16.17.1 as base
 
 WORKDIR /overleaf/services/web
 
diff --git a/services/web/Dockerfile.frontend b/services/web/Dockerfile.frontend
index c60119095a..d8ac84abd1 100644
--- a/services/web/Dockerfile.frontend
+++ b/services/web/Dockerfile.frontend
@@ -1,4 +1,4 @@
-FROM node:18.16.0
+FROM node:16.17.1
 
 # 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.common.env b/services/web/docker-compose.common.env
index fce8a95bf1..f9f94f8327 100644
--- a/services/web/docker-compose.common.env
+++ b/services/web/docker-compose.common.env
@@ -41,5 +41,5 @@ SHARELATEX_SAML_UPDATE_USER_DETAILS_ON_LOGIN=true
 SHARELATEX_SAML_CERT=MIIDXTCCAkWgAwIBAgIJAOvOeQ4xFTzsMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMTYxMTE1MTQxMjU5WhcNMjYxMTE1MTQxMjU5WjBFMQswCQYDVQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCT6MBe5G9VoLU8MfztOEbUhnwLp17ak8eFUqxqeXkkqtWB0b/cmIBU3xoQoO3dIF8PBzfqehqfYVhrNt/TFgcmDfmJnPJRL1RJWMW3VmiP5odJ3LwlkKbZpkeT3wZ8HEJIR1+zbpxiBNkbd2GbdR1iumcsHzMYX1A2CBj+ZMV5VijC+K4P0e9c05VsDEUtLmfeAasJAiumQoVVgAe/BpiXjICGGewa6EPFI7mKkifIRKOGxdRESwZZjxP30bI31oDN0cgKqIgSJtJ9nfCn9jgBMBkQHu42WMuaWD4jrGd7+vYdX+oIfArs9aKgAH5kUGhGdew2R9SpBefrhbNxG8QIDAQABo1AwTjAdBgNVHQ4EFgQU+aSojSyyLChP/IpZcafvSdhj7KkwHwYDVR0jBBgwFoAU+aSojSyyLChP/IpZcafvSdhj7KkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEABl3+OOVLBWMKs6PjA8lPuloWDNzSr3v76oUcHqAb+cfbucjXrOVsS9RJ0X9yxvCQyfM9FfY43DbspnN3izYhdvbJD8kKLNf0LA5st+ZxLfy0ACyL2iyAwICaqndqxAjQYplFAHmpUiu1DiHckyBPekokDJd+ze95urHMOsaGS5RWPoKJVE0bkaAeZCmEu0NNpXRSBiuxXSTeSAJfv6kyE/rkdhzUKyUl/cGQFrsVYfAFQVA+W6CKOh74ErSEzSHQQYndl7nD33snD/YqdU1ROxV6aJzLKCg+sdj+wRXSP2u/UHnM4jW9TGJfhO42jzL6WVuEvr9q4l7zWzUQKKKhtQ==
 # DEVICE_HISTORY_SECRET has been generated using:
 # NOTE: crypto.generateKeySync was added in v15, v16 is the next LTS release.
-# $ docker run --rm node:18 --print 'require("crypto").generateKeySync("aes", { length: 256 }).export().toString("hex")'
+# $ docker run --rm node:16 --print 'require("crypto").generateKeySync("aes", { length: 256 }).export().toString("hex")'
 DEVICE_HISTORY_SECRET=1b46e6cdf72db02845da06c9517c9cfbbfa0d87357479f4e1df3ce160bd54807
diff --git a/services/web/docker-compose.yml b/services/web/docker-compose.yml
index eae5f7ee02..a298cab572 100644
--- a/services/web/docker-compose.yml
+++ b/services/web/docker-compose.yml
@@ -6,7 +6,7 @@ volumes:
 services:
 
   test_unit:
-    image: node:18.16.0
+    image: node:16.17.1
     volumes:
       - .:/overleaf/services/web
       - ../../node_modules:/overleaf/node_modules
@@ -21,7 +21,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:18.16.0
+    image: node:16.17.1
     volumes:
       - .:/overleaf/services/web
       - ../../node_modules:/overleaf/node_modules
diff --git a/services/web/scripts/translations/Dockerfile b/services/web/scripts/translations/Dockerfile
index 0134cd11fa..b28b8b7167 100644
--- a/services/web/scripts/translations/Dockerfile
+++ b/services/web/scripts/translations/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.16.0
+FROM node:16.17.1
 
 WORKDIR /app/scripts/translations