mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
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:
parent
d613d7e1a2
commit
8aa8840db0
7 changed files with 10066 additions and 3894 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
|
WORKDIR /app
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ COPY . /app
|
||||||
|
|
||||||
RUN make compile_full
|
RUN make compile_full
|
||||||
|
|
||||||
FROM node:6.15.1
|
FROM node:10.15.3
|
||||||
|
|
||||||
COPY --from=app /app /app
|
COPY --from=app /app /app
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM node:8.9.4
|
FROM node:10.15.3
|
||||||
|
|
||||||
# Install Google Chrome
|
# Install Google Chrome
|
||||||
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
|
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
|
||||||
|
|
|
@ -165,7 +165,7 @@ webRouter.use (req, res, next) ->
|
||||||
frameguard: false
|
frameguard: false
|
||||||
})(req, res, next)
|
})(req, res, next)
|
||||||
|
|
||||||
profiler = require "v8-profiler"
|
profiler = require "v8-profiler-node8"
|
||||||
privateApiRouter.get "/profile", (req, res) ->
|
privateApiRouter.get "/profile", (req, res) ->
|
||||||
time = parseInt(req.query.time || "1000")
|
time = parseInt(req.query.time || "1000")
|
||||||
profiler.startProfiling("test")
|
profiler.startProfiling("test")
|
||||||
|
|
|
@ -6,7 +6,7 @@ volumes:
|
||||||
services:
|
services:
|
||||||
|
|
||||||
test_unit:
|
test_unit:
|
||||||
image: node:6.15.1
|
image: node:10.15.3
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/app
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
|
@ -16,7 +16,7 @@ services:
|
||||||
user: node
|
user: node
|
||||||
|
|
||||||
test_acceptance:
|
test_acceptance:
|
||||||
image: node:6.15.1
|
image: node:10.15.3
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/app
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
|
|
13944
services/web/npm-shrinkwrap.json
generated
13944
services/web/npm-shrinkwrap.json
generated
File diff suppressed because it is too large
Load diff
|
@ -106,7 +106,7 @@
|
||||||
"temp": "^0.8.3",
|
"temp": "^0.8.3",
|
||||||
"underscore": "1.6.0",
|
"underscore": "1.6.0",
|
||||||
"uuid": "^3.0.1",
|
"uuid": "^3.0.1",
|
||||||
"v8-profiler": "^5.2.3",
|
"v8-profiler-node8": "^6.0.1",
|
||||||
"valid-url": "^1.0.9",
|
"valid-url": "^1.0.9",
|
||||||
"xml2js": "0.2.0",
|
"xml2js": "0.2.0",
|
||||||
"xregexp": "^4.2.4",
|
"xregexp": "^4.2.4",
|
||||||
|
|
Loading…
Reference in a new issue