From 6eccaf30a3f3fae370ecb8fe134e12d2a57868aa Mon Sep 17 00:00:00 2001 From: Chrystal Griffiths Date: Thu, 24 Jan 2019 14:22:40 +0000 Subject: [PATCH 1/5] Bump build scripts to 1.11 and node to 6.16.0 --- services/spelling/.nvmrc | 2 +- services/spelling/Dockerfile | 4 ++-- services/spelling/Makefile | 2 +- services/spelling/buildscript.txt | 4 ++-- services/spelling/docker-compose.ci.yml | 3 ++- services/spelling/docker-compose.yml | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/services/spelling/.nvmrc b/services/spelling/.nvmrc index e1e5d1369a..bfec95bf0e 100644 --- a/services/spelling/.nvmrc +++ b/services/spelling/.nvmrc @@ -1 +1 @@ -6.9.5 +6.16.0 diff --git a/services/spelling/Dockerfile b/services/spelling/Dockerfile index 2845544ae6..cfb417387e 100644 --- a/services/spelling/Dockerfile +++ b/services/spelling/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.9.5 as app +FROM node:6.16.0 as app WORKDIR /app @@ -12,7 +12,7 @@ COPY . /app RUN npm run compile:all -FROM node:6.9.5 +FROM node:6.16.0 COPY --from=app /app /app diff --git a/services/spelling/Makefile b/services/spelling/Makefile index 1fd689fae1..ec61766489 100644 --- a/services/spelling/Makefile +++ b/services/spelling/Makefile @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.10 +# Version: 1.1.11 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) diff --git a/services/spelling/buildscript.txt b/services/spelling/buildscript.txt index f07e877ba9..ebd1bf80d4 100644 --- a/services/spelling/buildscript.txt +++ b/services/spelling/buildscript.txt @@ -1,6 +1,6 @@ ---script-version=1.1.10 +--script-version=1.1.11 spelling ---node-version=6.9.5 +--node-version=6.16.0 --acceptance-creds=None --language=coffeescript --dependencies=mongo,redis diff --git a/services/spelling/docker-compose.ci.yml b/services/spelling/docker-compose.ci.yml index 5ab90e1825..3c57490e8a 100644 --- a/services/spelling/docker-compose.ci.yml +++ b/services/spelling/docker-compose.ci.yml @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.10 +# Version: 1.1.11 version: "2" @@ -11,6 +11,7 @@ services: user: node command: npm run test:unit:_run + test_acceptance: build: . image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER diff --git a/services/spelling/docker-compose.yml b/services/spelling/docker-compose.yml index aeceafb3f3..0ecd2bd3d4 100644 --- a/services/spelling/docker-compose.yml +++ b/services/spelling/docker-compose.yml @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.10 +# Version: 1.1.11 version: "2" From a708c347d4e6651d52e68ce50f7568e6230b4bf7 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Fri, 25 Jan 2019 11:33:23 +0000 Subject: [PATCH 2/5] Run gpg with no tty --- services/spelling/install_deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/spelling/install_deps.sh b/services/spelling/install_deps.sh index 8e8dc75381..7be7c2ea24 100644 --- a/services/spelling/install_deps.sh +++ b/services/spelling/install_deps.sh @@ -1,8 +1,8 @@ # some spelling packages are missing from debian and are on ubuntulo echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main universe" >> /etc/apt/sources.list -apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 +apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 apt-get update apt-get install -y aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-alt aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-no aspell-nr aspell-ns aspell-or aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sk aspell-ss aspell-st aspell-sv aspell-ta aspell-te aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu mkdir /app/cache chown node:node /app/cache -chmod 0777 /app/cache \ No newline at end of file +chmod 0777 /app/cache From 59c18c470dd974e7b378214fe0c7a76c874d25ee Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 21 Feb 2019 09:09:07 +0000 Subject: [PATCH 3/5] Clarify which dicts are from Ubuntu --- services/spelling/install_deps.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/spelling/install_deps.sh b/services/spelling/install_deps.sh index 7be7c2ea24..5712f2117c 100644 --- a/services/spelling/install_deps.sh +++ b/services/spelling/install_deps.sh @@ -1,4 +1,6 @@ -# some spelling packages are missing from debian and are on ubuntulo +# The following aspell packages exist in Ubuntu but not Debian: +# aspell-af, aspell-id, aspell-nr, aspell-ns, aspell-ss, aspell-st, aspell-tn, +# aspell-ts, aspell-xh, aspell-zu echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main universe" >> /etc/apt/sources.list apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 apt-get update From 49c91087880f75934d3db73906398b7de831d974 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 21 Feb 2019 10:15:23 +0000 Subject: [PATCH 4/5] Fix aspell or, te and no. Still need to fix ta --- services/spelling/install_deps.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/services/spelling/install_deps.sh b/services/spelling/install_deps.sh index 5712f2117c..a880677192 100644 --- a/services/spelling/install_deps.sh +++ b/services/spelling/install_deps.sh @@ -1,10 +1,18 @@ +echo 'APT::Default-Release "stretch";' >/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-ss, aspell-st, aspell-tn, # aspell-ts, aspell-xh, aspell-zu -echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main universe" >> /etc/apt/sources.list +echo "deb http://us.archive.ubuntu.com/ubuntu/ bionic main universe" > /etc/apt/sources.list.d/bionic.list apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 +# Need to install aspell-or, aspell-ta and aspell-te from testing (buster) as +# broken in stable (stretch). +echo "deb http://http.us.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list + apt-get update -apt-get install -y aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-alt aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-no aspell-nr aspell-ns aspell-or aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sk aspell-ss aspell-st aspell-sv aspell-ta aspell-te aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu +apt-get install -y aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-alt aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-nr aspell-ns aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sk aspell-ss aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu aspell-ta + +apt-get install aspell-or=0.03-1-6 aspell-te=0.01-2-6 aspell-no=2.2-4 mkdir /app/cache chown node:node /app/cache chmod 0777 /app/cache From 67f3cc7f310cc71a97898c9c6f3c80e830e4bdb6 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Sat, 23 Feb 2019 01:40:28 +0000 Subject: [PATCH 5/5] Fix aspell-ta --- services/spelling/install_deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/spelling/install_deps.sh b/services/spelling/install_deps.sh index a880677192..159baf3e19 100644 --- a/services/spelling/install_deps.sh +++ b/services/spelling/install_deps.sh @@ -10,9 +10,9 @@ apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F echo "deb http://http.us.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list apt-get update -apt-get install -y aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-alt aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-nr aspell-ns aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sk aspell-ss aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu aspell-ta +apt-get install -y aspell aspell-en aspell-af aspell-am aspell-ar aspell-ar-large aspell-bg aspell-bn aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-alt aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-gu aspell-he aspell-hi aspell-hr aspell-hsb aspell-hu aspell-hy aspell-id aspell-is aspell-it aspell-kk aspell-kn aspell-ku aspell-lt aspell-lv aspell-ml aspell-mr aspell-nl aspell-nr aspell-ns aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sk aspell-ss aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-uk aspell-uz aspell-xh aspell-zu -apt-get install aspell-or=0.03-1-6 aspell-te=0.01-2-6 aspell-no=2.2-4 +apt-get install aspell-or=0.03-1-6 aspell-te=0.01-2-6 aspell-no=2.2-4 aspell-ta=20040424-1-2 mkdir /app/cache chown node:node /app/cache chmod 0777 /app/cache