From 6601e94db7876e0eb2aba9ea2e01fde92615d1c1 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 30 Apr 2019 23:33:59 +0200 Subject: [PATCH 1/4] [misc] bump socket.io to 0.9.19 for node7+ support Signed-off-by: Jakob Ackermann --- services/real-time/npm-shrinkwrap.json | 6 +++--- services/real-time/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/real-time/npm-shrinkwrap.json b/services/real-time/npm-shrinkwrap.json index 95656f81fd..a341bea726 100644 --- a/services/real-time/npm-shrinkwrap.json +++ b/services/real-time/npm-shrinkwrap.json @@ -1560,9 +1560,9 @@ "dev": true }, "socket.io": { - "version": "0.9.16", - "from": "socket.io@0.9.16", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz", + "version": "0.9.19", + "from": "socket.io@0.9.19", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-0.9.19.tgz", "dependencies": { "redis": { "version": "0.7.3", diff --git a/services/real-time/package.json b/services/real-time/package.json index 60a978f3b5..e1e4573696 100644 --- a/services/real-time/package.json +++ b/services/real-time/package.json @@ -34,7 +34,7 @@ "request": "^2.88.0", "session.socket.io": "^0.1.6", "settings-sharelatex": "^1.1.0", - "socket.io": "0.9.16", + "socket.io": "^0.9.19", "socket.io-client": "^0.9.16" }, "devDependencies": { From 79a314d5fd5f8b6a6b3a69371d543496f458b78a Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 1 May 2019 00:56:32 +0200 Subject: [PATCH 2/4] [misc] disable the flash transport We do not use flash on the website and the policy file provider is not compatible with node7+. Signed-off-by: Jakob Ackermann --- services/real-time/app.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/real-time/app.coffee b/services/real-time/app.coffee index 6161e63a46..5c10bdb36f 100644 --- a/services/real-time/app.coffee +++ b/services/real-time/app.coffee @@ -45,7 +45,7 @@ io.configure -> # gzip uses a Node 0.8.x method of calling the gzip program which # doesn't work with 0.6.x #io.enable('browser client gzip') - io.set('transports', ['websocket', 'flashsocket', 'htmlfile', 'xhr-polling', 'jsonp-polling']) + io.set('transports', ['websocket', 'htmlfile', 'xhr-polling', 'jsonp-polling']) io.set('log level', 1) app.get "/", (req, res, next) -> From 5f045d9792ed09929ce53516fff3c3cef5618625 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Mon, 13 May 2019 11:54:37 +0100 Subject: [PATCH 3/4] Update buildscripts to 1.1.21 --- services/real-time/Makefile | 6 ++++-- services/real-time/buildscript.txt | 2 +- services/real-time/docker-compose.ci.yml | 5 ++++- services/real-time/docker-compose.yml | 8 ++++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/services/real-time/Makefile b/services/real-time/Makefile index fdf938da5a..573659dd90 100644 --- a/services/real-time/Makefile +++ b/services/real-time/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.12 +# Version: 1.1.21 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -26,7 +26,9 @@ test: test_unit test_acceptance test_unit: @[ ! -d test/unit ] && echo "real-time has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit -test_acceptance: test_clean test_acceptance_pre_run # clear the database before each acceptance test run +test_acceptance: test_clean test_acceptance_pre_run test_acceptance_run + +test_acceptance_run: @[ ! -d test/acceptance ] && echo "real-time has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance test_clean: diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 5d6ccb471c..1f61f10934 100644 --- a/services/real-time/buildscript.txt +++ b/services/real-time/buildscript.txt @@ -5,4 +5,4 @@ real-time --dependencies=mongo,redis --docker-repos=gcr.io/overleaf-ops --build-target=docker ---script-version=1.1.12 +--script-version=1.1.21 diff --git a/services/real-time/docker-compose.ci.yml b/services/real-time/docker-compose.ci.yml index 36b52f8f8b..d2bcca9ec6 100644 --- a/services/real-time/docker-compose.ci.yml +++ b/services/real-time/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.12 +# Version: 1.1.21 version: "2" @@ -10,6 +10,8 @@ services: image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER user: node command: npm run test:unit:_run + environment: + NODE_ENV: test test_acceptance: @@ -21,6 +23,7 @@ services: MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} + NODE_ENV: test depends_on: - mongo - redis diff --git a/services/real-time/docker-compose.yml b/services/real-time/docker-compose.yml index 8bb7857cb6..47b12619da 100644 --- a/services/real-time/docker-compose.yml +++ b/services/real-time/docker-compose.yml @@ -1,18 +1,19 @@ # 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.12 +# Version: 1.1.21 version: "2" services: test_unit: - build: . + image: node:6.15.1 volumes: - .:/app working_dir: /app environment: MOCHA_GREP: ${MOCHA_GREP} + NODE_ENV: test command: npm run test:unit user: node @@ -27,6 +28,8 @@ services: MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} + LOG_LEVEL: ERROR + NODE_ENV: test user: node depends_on: - mongo @@ -49,3 +52,4 @@ services: mongo: image: mongo:3.4 + From 20683f309496095df8518d1f8cb0f7daf3d27d8d Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Mon, 13 May 2019 11:55:42 +0100 Subject: [PATCH 4/4] Update Node from 6.15.1 to 10.15.3 --- services/real-time/.nvmrc | 2 +- services/real-time/Dockerfile | 4 ++-- services/real-time/buildscript.txt | 2 +- services/real-time/docker-compose.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/real-time/.nvmrc b/services/real-time/.nvmrc index d36e8d82f3..348076b955 100644 --- a/services/real-time/.nvmrc +++ b/services/real-time/.nvmrc @@ -1 +1 @@ -6.15.1 +10.15.3 diff --git a/services/real-time/Dockerfile b/services/real-time/Dockerfile index e7243c5291..bdfbfbd123 100644 --- a/services/real-time/Dockerfile +++ b/services/real-time/Dockerfile @@ -1,4 +1,4 @@ -FROM node:6.15.1 as app +FROM node:10.15.3 as app WORKDIR /app @@ -12,7 +12,7 @@ COPY . /app RUN npm run compile:all -FROM node:6.15.1 +FROM node:10.15.3 COPY --from=app /app /app diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 1f61f10934..07e0c1e9ac 100644 --- a/services/real-time/buildscript.txt +++ b/services/real-time/buildscript.txt @@ -1,6 +1,6 @@ real-time --language=coffeescript ---node-version=6.15.1 +--node-version=10.15.3 --acceptance-creds=None --dependencies=mongo,redis --docker-repos=gcr.io/overleaf-ops diff --git a/services/real-time/docker-compose.yml b/services/real-time/docker-compose.yml index 47b12619da..0d55e99a9c 100644 --- a/services/real-time/docker-compose.yml +++ b/services/real-time/docker-compose.yml @@ -7,7 +7,7 @@ version: "2" services: test_unit: - image: node:6.15.1 + image: node:10.15.3 volumes: - .:/app working_dir: /app