github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
rollback broken node 18 services

GitOrigin-RevId: 7aa84d0cc864474d00fe881db100a4c6ec7d798c
This commit is contained in:
Brian Gough 2023-04-19 15:15:31 +01:00 committed by Copybot
parent 3f85b8732f
commit 8d55ebc662
20 changed files with 30 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/clsi/.nvmrc
View file

@ -1 +1 @@
18.16.0 16.17.1

2
services/clsi/Dockerfile
View file

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

2
services/clsi/buildscript.txt
View file

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

2
services/document-updater/.nvmrc
View file

@ -1 +1 @@
18.16.0 16.17.1

2
services/document-updater/Dockerfile
View file

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

2
services/document-updater/buildscript.txt
View file

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

4
services/document-updater/docker-compose.yml
View file

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

2
services/history-v1/.nvmrc
View file

@ -1 +1 @@
18.16.0 16.17.1

2
services/history-v1/Dockerfile
View file

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

2
services/history-v1/buildscript.txt
View file

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

4
services/history-v1/docker-compose.yml
View file

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

2
services/project-history/.nvmrc
View file

@ -1 +1 @@
18.16.0 16.17.1

2
services/project-history/Dockerfile
View file

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

2
services/project-history/buildscript.txt
View file

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

4
services/project-history/docker-compose.yml
View file

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

2
services/spelling/.nvmrc
View file

@ -1 +1 @@
18.16.0 16.17.1

2
services/spelling/Dockerfile
View file

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

2
services/spelling/buildscript.txt
View file

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

10
services/spelling/install_deps.sh
View file

@ -3,7 +3,7 @@
set -ex set -ex
# Prefer Debian packages over Ubuntu packages # 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: # 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 # 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 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 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 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

21
services/spelling/test/acceptance/js/CheckTest.js
View file

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