Merge pull request #12706 from overleaf/bg-rollback-broken-node-18-services

rollback broken node 18 services

GitOrigin-RevId: 7aa84d0cc864474d00fe881db100a4c6ec7d798c

services/clsi/.nvmrc

@@ -1 +1 @@
-18.16.0
+16.17.1

services/clsi/Dockerfile

@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:18.16.0 as base
+FROM node:16.17.1 as base
 
 WORKDIR /overleaf/services/clsi
 COPY services/clsi/install_deps.sh /overleaf/services/clsi/

services/clsi/buildscript.txt

@@ -5,6 +5,6 @@ clsi
 --env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true"
 --env-pass-through=TEXLIVE_IMAGE
 --has-custom-cloudbuild=True
---node-version=18.16.0
+--node-version=16.17.1
 --public-repo=True
 --script-version=4.1.0

services/document-updater/.nvmrc

@@ -1 +1 @@
-18.16.0
+16.17.1

services/document-updater/Dockerfile

@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:18.16.0 as base
+FROM node:16.17.1 as base
 
 WORKDIR /overleaf/services/document-updater
 

services/document-updater/buildscript.txt

@@ -3,6 +3,6 @@ document-updater
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
---node-version=18.16.0
+--node-version=16.17.1
 --public-repo=True
 --script-version=4.1.0

services/document-updater/docker-compose.yml

@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:18.16.0
+    image: node:16.17.1
     volumes:
       - .:/overleaf/services/document-updater
       - ../../node_modules:/overleaf/node_modules
@@ -20,7 +20,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:18.16.0
+    image: node:16.17.1
     volumes:
       - .:/overleaf/services/document-updater
       - ../../node_modules:/overleaf/node_modules

services/history-v1/.nvmrc

@@ -1 +1 @@
-18.16.0
+16.17.1

services/history-v1/Dockerfile

@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:18.16.0 as base
+FROM node:16.17.1 as base
 
 WORKDIR /overleaf/services/history-v1
 

services/history-v1/buildscript.txt

@@ -3,6 +3,6 @@ history-v1
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
---node-version=18.16.0
+--node-version=16.17.1
 --public-repo=False
 --script-version=4.1.0

services/history-v1/docker-compose.yml

@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:18.16.0
+    image: node:16.17.1
     volumes:
       - .:/overleaf/services/history-v1
       - ../../node_modules:/overleaf/node_modules
@@ -20,7 +20,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:18.16.0
+    image: node:16.17.1
     volumes:
       - .:/overleaf/services/history-v1
       - ../../node_modules:/overleaf/node_modules

services/project-history/.nvmrc

@@ -1 +1 @@
-18.16.0
+16.17.1

services/project-history/Dockerfile

@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:18.16.0 as base
+FROM node:16.17.1 as base
 
 WORKDIR /overleaf/services/project-history
 

services/project-history/buildscript.txt

@@ -3,6 +3,6 @@ project-history
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
---node-version=18.16.0
+--node-version=16.17.1
 --public-repo=False
 --script-version=4.1.0

services/project-history/docker-compose.yml

@@ -6,7 +6,7 @@ version: "2.3"
 
 services:
   test_unit:
-    image: node:18.16.0
+    image: node:16.17.1
     volumes:
       - .:/overleaf/services/project-history
       - ../../node_modules:/overleaf/node_modules
@@ -20,7 +20,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:18.16.0
+    image: node:16.17.1
     volumes:
       - .:/overleaf/services/project-history
       - ../../node_modules:/overleaf/node_modules

services/spelling/.nvmrc

@@ -1 +1 @@
-18.16.0
+16.17.1

services/spelling/Dockerfile

@@ -2,7 +2,7 @@
 # Instead run bin/update_build_scripts from
 # https://github.com/overleaf/internal/
 
-FROM node:18.16.0 as base
+FROM node:16.17.1 as base
 
 WORKDIR /overleaf/services/spelling
 COPY services/spelling/install_deps.sh /overleaf/services/spelling/

services/spelling/buildscript.txt

@@ -4,6 +4,6 @@ spelling
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
 --env-pass-through=
---node-version=18.16.0
+--node-version=16.17.1
 --public-repo=False
 --script-version=4.1.0

services/spelling/install_deps.sh

@@ -3,7 +3,7 @@
 set -ex
 
 # Prefer Debian packages over Ubuntu packages
-echo 'APT::Default-Release "bullseye";' >/etc/apt/apt.conf.d/default-release
+echo 'APT::Default-Release "buster";' >/etc/apt/apt.conf.d/default-release
 
 # The following aspell packages exist in Ubuntu but not Debian:
 # aspell-af, aspell-id, aspell-nr, aspell-ns, aspell-st, aspell-tn, aspell-ts, aspell-xh
@@ -11,5 +11,11 @@ echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main universe" >
 echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main universe" > /etc/apt/sources.list.d/focal-ports-arm.list
 apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
 
+# aspell-pt-pt is broken in buster, we'll obtain it from bullseye
+echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
+
 apt-get update
-apt-get install -y aspell aspell-en aspell-af aspell-ar aspell-ar-large aspell-bg aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-1901 aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-hr aspell-hsb aspell-id aspell-it aspell-kk aspell-ku aspell-lt aspell-lv aspell-nl aspell-no aspell-nr aspell-ns  aspell-pa aspell-pl aspell-pt-br aspell-pt-pt aspell-ro aspell-ru aspell-sk aspell-sl aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-xh
+apt-get install -y aspell aspell-en aspell-af aspell-ar aspell-ar-large aspell-bg aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-1901 aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-hr aspell-hsb aspell-id aspell-it aspell-kk aspell-ku aspell-lt aspell-lv aspell-nl aspell-no aspell-nr aspell-ns  aspell-pa aspell-pl aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-xh
+
+# aspell-pt-pt is broken in buster. Install it from bullseye
+apt-get install -y -t bullseye aspell-pt-pt

services/spelling/test/acceptance/js/CheckTest.js

@@ -27,26 +27,7 @@ describe('checking words', function () {
     it('should return the list of misspellings', async function () {
       const body = JSON.parse(response.body)
       expect(body).to.deep.equal({
-        misspellings: [
-          {
-            index: 0,
-            suggestions: [
-              'anther',
-              'another',
-              'anthers',
-              'panther',
-              'anathema',
-              'anthem',
-              'nether',
-              "anther's",
-              'ante',
-              'neither',
-              'norther',
-              'ether',
-              'other',
-            ],
-          },
-        ],
+        misspellings: [{ index: 0, suggestions: ['anther', 'another'] }],
       })
     })
   })