From 78372119f81390f6c74fd31001bd9f4a033d2d3b Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 24 May 2019 15:21:48 +0100 Subject: [PATCH] Revert "Csh issue 1118 node 10.15.3" --- services/real-time/.nvmrc | 2 +- services/real-time/Dockerfile | 4 ++-- services/real-time/Makefile | 6 ++---- services/real-time/app.coffee | 2 +- services/real-time/buildscript.txt | 4 ++-- services/real-time/docker-compose.ci.yml | 5 +---- services/real-time/docker-compose.yml | 8 ++------ services/real-time/npm-shrinkwrap.json | 6 +++--- services/real-time/package.json | 2 +- 9 files changed, 15 insertions(+), 24 deletions(-) diff --git a/services/real-time/.nvmrc b/services/real-time/.nvmrc index 348076b955..d36e8d82f3 100644 --- a/services/real-time/.nvmrc +++ b/services/real-time/.nvmrc @@ -1 +1 @@ -10.15.3 +6.15.1 diff --git a/services/real-time/Dockerfile b/services/real-time/Dockerfile index bdfbfbd123..e7243c5291 100644 --- a/services/real-time/Dockerfile +++ b/services/real-time/Dockerfile @@ -1,4 +1,4 @@ -FROM node:10.15.3 as app +FROM node:6.15.1 as app WORKDIR /app @@ -12,7 +12,7 @@ COPY . /app RUN npm run compile:all -FROM node:10.15.3 +FROM node:6.15.1 COPY --from=app /app /app diff --git a/services/real-time/Makefile b/services/real-time/Makefile index 573659dd90..fdf938da5a 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.21 +# Version: 1.1.12 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -26,9 +26,7 @@ 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 test_acceptance_run - -test_acceptance_run: +test_acceptance: test_clean test_acceptance_pre_run # clear the database before each acceptance test 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/app.coffee b/services/real-time/app.coffee index 5c10bdb36f..6161e63a46 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', 'htmlfile', 'xhr-polling', 'jsonp-polling']) + io.set('transports', ['websocket', 'flashsocket', 'htmlfile', 'xhr-polling', 'jsonp-polling']) io.set('log level', 1) app.get "/", (req, res, next) -> diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 07e0c1e9ac..5d6ccb471c 100644 --- a/services/real-time/buildscript.txt +++ b/services/real-time/buildscript.txt @@ -1,8 +1,8 @@ real-time --language=coffeescript ---node-version=10.15.3 +--node-version=6.15.1 --acceptance-creds=None --dependencies=mongo,redis --docker-repos=gcr.io/overleaf-ops --build-target=docker ---script-version=1.1.21 +--script-version=1.1.12 diff --git a/services/real-time/docker-compose.ci.yml b/services/real-time/docker-compose.ci.yml index d2bcca9ec6..36b52f8f8b 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.21 +# Version: 1.1.12 version: "2" @@ -10,8 +10,6 @@ services: image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER user: node command: npm run test:unit:_run - environment: - NODE_ENV: test test_acceptance: @@ -23,7 +21,6 @@ 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 0d55e99a9c..8bb7857cb6 100644 --- a/services/real-time/docker-compose.yml +++ b/services/real-time/docker-compose.yml @@ -1,19 +1,18 @@ # 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.21 +# Version: 1.1.12 version: "2" services: test_unit: - image: node:10.15.3 + build: . volumes: - .:/app working_dir: /app environment: MOCHA_GREP: ${MOCHA_GREP} - NODE_ENV: test command: npm run test:unit user: node @@ -28,8 +27,6 @@ services: MONGO_HOST: mongo POSTGRES_HOST: postgres MOCHA_GREP: ${MOCHA_GREP} - LOG_LEVEL: ERROR - NODE_ENV: test user: node depends_on: - mongo @@ -52,4 +49,3 @@ services: mongo: image: mongo:3.4 - diff --git a/services/real-time/npm-shrinkwrap.json b/services/real-time/npm-shrinkwrap.json index a341bea726..95656f81fd 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.19", - "from": "socket.io@0.9.19", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-0.9.19.tgz", + "version": "0.9.16", + "from": "socket.io@0.9.16", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz", "dependencies": { "redis": { "version": "0.7.3", diff --git a/services/real-time/package.json b/services/real-time/package.json index e1e4573696..60a978f3b5 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.19", + "socket.io": "0.9.16", "socket.io-client": "^0.9.16" }, "devDependencies": {