Просмотр исходного кода

Merge pull request #101 from overleaf/spd-node12-upgrade

Upgrade to node 12
Simon Detheridge 6 лет назад
Родитель
Сommit
79ea76be52

+ 1 - 1
services/filestore/.nvmrc

@@ -1 +1 @@
-10.19.0
+12.16.1

+ 1 - 1
services/filestore/Dockerfile

@@ -3,7 +3,7 @@
 # https://github.com/sharelatex/sharelatex-dev-environment
 # Version: 1.3.6
 
-FROM node:10.19.0 as base
+FROM node:12.16.1 as base
 
 WORKDIR /app
 COPY install_deps.sh /app

+ 5 - 5
services/filestore/buildscript.txt

@@ -1,11 +1,11 @@
 filestore
---public-repo=True
---language=es
---env-add=ENABLE_CONVERSIONS="true",USE_PROM_METRICS="true",AWS_S3_USER_FILES_BUCKET_NAME=fake_user_files,AWS_S3_TEMPLATE_FILES_BUCKET_NAME=fake_template_files,AWS_S3_PUBLIC_FILES_BUCKET_NAME=fake_public_files
---node-version=10.19.0
 --acceptance-creds=
+--data-dirs=uploads,user_files,template_files
 --dependencies=s3
 --docker-repos=gcr.io/overleaf-ops
+--env-add=ENABLE_CONVERSIONS="true",USE_PROM_METRICS="true",AWS_S3_USER_FILES_BUCKET_NAME=fake_user_files,AWS_S3_TEMPLATE_FILES_BUCKET_NAME=fake_template_files,AWS_S3_PUBLIC_FILES_BUCKET_NAME=fake_public_files
 --env-pass-through=
---data-dirs=uploads,user_files,template_files
+--language=es
+--node-version=12.16.1
+--public-repo=True
 --script-version=1.3.6

+ 1 - 1
services/filestore/test/unit/js/SettingsTests.js

@@ -13,7 +13,7 @@ describe('Settings', function() {
       }
       process.env.S3_BUCKET_CREDENTIALS = JSON.stringify(s3Settings)
       const settings = SandboxedModule.require('settings-sharelatex', {
-        globals: { console }
+        globals: { console, process }
       })
       expect(settings.filestore.s3BucketCreds).to.deep.equal(s3Settings)
     })