mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
Merge pull request #49 from overleaf/csh-issue-1118-node-10.15.3
Csh issue 1118 node 10.15.3
This commit is contained in:
commit
8086d01001
9 changed files with 24 additions and 15 deletions
|
@ -1 +1 @@
|
|||
6.15.1
|
||||
10.15.3
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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) ->
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
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
|
||||
--build-target=docker
|
||||
--script-version=1.1.12
|
||||
--script-version=1.1.21
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:10.15.3
|
||||
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
|
||||
|
||||
|
||||
|
|
6
services/real-time/npm-shrinkwrap.json
generated
6
services/real-time/npm-shrinkwrap.json
generated
|
@ -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",
|
||||
|
|
|
@ -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": {
|
||||
|
|
Loading…
Reference in a new issue