Merge pull request #13 from sharelatex/csh-ho-docker-issue-1338-bulk-upgrade

Services bulk upgrade - spelling

services/spelling/.gitignore

@@ -5,4 +5,5 @@ app.js
 test/UnitTests/js/*
 node_modules/*
 test/unit/js/
-cache/spell.cache
+cache/spell.cache
+app.js.map

services/spelling/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"]

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.9
+# Version: 1.1.10
 
 BUILD_NUMBER ?= local
 BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)

services/spelling/app.coffee

@@ -1,17 +1,20 @@
+metrics = require("metrics-sharelatex")
+metrics.initialize("spelling")
+
+
 Settings = require 'settings-sharelatex'
 logger = require 'logger-sharelatex'
 logger.initialize("spelling-sharelatex")
 if Settings.sentry?.dsn?
 	logger.initializeErrorReporting(Settings.sentry.dsn)
+metrics.memory.monitor(logger)
 
 SpellingAPIController = require './app/js/SpellingAPIController'
 express = require('express')
 Path = require("path")
 server = express()
+metrics.injectMetricsRoute(server)
 bodyParser = require('body-parser')
-metrics = require("metrics-sharelatex")
-metrics.initialize("spelling")
-metrics.memory.monitor(logger)
 HealthCheckController = require("./app/js/HealthCheckController")
 
 

services/spelling/buildscript.txt

@@ -1,4 +1,4 @@
---script-version=1.1.9
+--script-version=1.1.10
 spelling
 --node-version=6.9.5
 --acceptance-creds=None

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.9
+# Version: 1.1.10
 
 version: "2"
 

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.9
+# Version: 1.1.10
 
 version: "2"
 

services/spelling/package.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/sharelatex/spelling-sharelatex.git"
   },
   "scripts": {
-    "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')",
     "start": "npm run compile:app && node $NODE_APP_OPTIONS app.js",
     "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 30000 --exit $@ test/acceptance/js",
     "test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:_run -- --grep=$MOCHA_GREP",
@@ -25,9 +25,9 @@
     "body-parser": "^1.12.0",
     "coffee-script": "^1.9.1",
     "express": "^4.12.1",
-    "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.1.0",
+    "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.5.9",
     "lru-cache": "^4.0.0",
-    "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.7.1",
+    "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v2.0.12",
     "mongojs": "2.4.0",
     "node-statsd": "0.0.3",
     "redis": "~0.8.4",