diff --git a/services/filestore/.gitignore b/services/filestore/.gitignore index 9cb1da9a39..fcc07f9527 100644 --- a/services/filestore/.gitignore +++ b/services/filestore/.gitignore @@ -40,6 +40,7 @@ test/IntergrationTests/js/* data/*/* app.js +app.js.map cluster.js app/js/* test/IntergrationTests/js/* diff --git a/services/filestore/Dockerfile b/services/filestore/Dockerfile index 3ced888df3..2845544ae6 100644 --- a/services/filestore/Dockerfile +++ b/services/filestore/Dockerfile @@ -20,4 +20,4 @@ WORKDIR /app RUN chmod 0755 ./install_deps.sh && ./install_deps.sh USER node -CMD ["node","app.js"] +CMD ["node", "--expose-gc", "app.js"] diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 9b34c3ccb9..d39712d9fe 100644 --- a/services/filestore/Makefile +++ b/services/filestore/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.9 +# Version: 1.1.10 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index d4c335faa9..041e0b4745 100644 --- a/services/filestore/buildscript.txt +++ b/services/filestore/buildscript.txt @@ -1,9 +1,9 @@ ---script-version=1.1.9 +--script-version=1.1.10 filestore --node-version=6.9.5 --acceptance-creds=None --language=coffeescript ---dependencies=['mongo', 'redis'] ---docker-repos=['gcr.io/overleaf-ops'] +--dependencies=mongo,redis +--docker-repos=gcr.io/overleaf-ops --kube=false --build-target=docker diff --git a/services/filestore/docker-compose.ci.yml b/services/filestore/docker-compose.ci.yml index 17c4ddd2bf..5ab90e1825 100644 --- a/services/filestore/docker-compose.ci.yml +++ b/services/filestore/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.9 +# Version: 1.1.10 version: "2" diff --git a/services/filestore/docker-compose.yml b/services/filestore/docker-compose.yml index dcbc14e683..aeceafb3f3 100644 --- a/services/filestore/docker-compose.yml +++ b/services/filestore/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.9 +# Version: 1.1.10 version: "2" diff --git a/services/filestore/package.json b/services/filestore/package.json index c13e416fa0..e35a2c009b 100644 --- a/services/filestore/package.json +++ b/services/filestore/package.json @@ -13,7 +13,7 @@ "test:unit": "npm run compile:app && npm run compile:unit_tests && npm run test:unit:_run -- --grep=$MOCHA_GREP", "compile:unit_tests": "[ ! -e test/unit/coffee ] && echo 'No unit tests to compile' || coffee -o test/unit/js -c test/unit/coffee", "compile:acceptance_tests": "[ ! -e test/acceptance/coffee ] && echo 'No acceptance tests to compile' || coffee -o test/acceptance/js -c test/acceptance/coffee", - "compile:app": "([ -e app/coffee ] && coffee $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')", + "compile:app": "([ -e app/coffee ] && coffee -m $COFFEE_OPTIONS -o app/js -c app/coffee || echo 'No CoffeeScript folder to compile') && ( [ -e app.coffee ] && coffee -m $COFFEE_OPTIONS -c app.coffee || echo 'No CoffeeScript app to compile')", "compile:all": "npm run compile:app && npm run compile:unit_tests && npm run compile:acceptance_tests && npm run compile:smoke_tests", "start": "npm run compile:app && node $NODE_APP_OPTIONS app.js", "nodemon": "nodemon --config nodemon.json",