Merge pull request #1745 from overleaf/csh-issue-1118-node-10.15.3

Csh issue 1118 node 10.15.3

GitOrigin-RevId: 5b75d030d9d07bdb41dbca46f90fd950293e17b3
This commit is contained in:
Christopher Hoskin 2019-05-07 11:47:41 +01:00 committed by sharelatex
parent d613d7e1a2
commit 8aa8840db0
7 changed files with 10066 additions and 3894 deletions

View file

@ -1 +1 @@
6.15.1
10.15.3

View file

@ -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 make compile_full
FROM node:6.15.1
FROM node:10.15.3
COPY --from=app /app /app

View file

@ -1,4 +1,4 @@
FROM node:8.9.4
FROM node:10.15.3
# Install Google Chrome
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -

View file

@ -165,7 +165,7 @@ webRouter.use (req, res, next) ->
frameguard: false
})(req, res, next)
profiler = require "v8-profiler"
profiler = require "v8-profiler-node8"
privateApiRouter.get "/profile", (req, res) ->
time = parseInt(req.query.time || "1000")
profiler.startProfiling("test")

View file

@ -6,7 +6,7 @@ volumes:
services:
test_unit:
image: node:6.15.1
image: node:10.15.3
volumes:
- .:/app
working_dir: /app
@ -16,7 +16,7 @@ services:
user: node
test_acceptance:
image: node:6.15.1
image: node:10.15.3
volumes:
- .:/app
working_dir: /app

File diff suppressed because it is too large Load diff

View file

@ -106,7 +106,7 @@
"temp": "^0.8.3",
"underscore": "1.6.0",
"uuid": "^3.0.1",
"v8-profiler": "^5.2.3",
"v8-profiler-node8": "^6.0.1",
"valid-url": "^1.0.9",
"xml2js": "0.2.0",
"xregexp": "^4.2.4",