Merge pull request #1471 from sharelatex/ho-docker2

Move to docker image based builds

GitOrigin-RevId: 992aeaf69bfea4d1847a07c457575a63985d4407
This commit is contained in:
Henry Oswald
2019-03-11 10:59:20 +00:00
committed by James Allen
parent 57450bb0fb
commit d55b38cc05
12 changed files with 1097 additions and 454 deletions
+8 -7
View File
@@ -10,11 +10,12 @@
"public": "./public"
},
"scripts": {
"test:acceptance:run_dir": "mocha --recursive --reporter spec --timeout 15000 --exit $@",
"test:unit": "npm -q run compile && bin/unit_test $@",
"test:unit:app": "npm -q run compile && bin/unit_test_app $@",
"test:acceptance:run_dir": "mocha --recursive --reporter spec --timeout 15000 --exit --grep=$MOCHA_GREP $@",
"test:unit": "npm -q run compile:app && bin/unit_test --grep=$MOCHA_GREP $@",
"test:unit:app": "npm -q run compile:app && bin/unit_test_app $@",
"test:frontend": "karma start",
"compile": "make compile",
"compile:app": "make compile_app",
"start": "npm -q run compile && node $NODE_APP_OPTIONS app.js",
"nodemon": "nodemon --config nodemon.json",
"nodemon:frontend": "nodemon --config nodemon.frontend.json",
@@ -58,12 +59,12 @@
"jsonwebtoken": "^8.0.1",
"ldapjs": "^0.7.1",
"lodash": "^4.13.1",
"logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#master",
"logger-sharelatex": "^1.6.0",
"lynx": "0.1.1",
"mailchimp-api-v3": "^1.12.0",
"marked": "^0.3.5",
"method-override": "^2.3.3",
"metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.8.0",
"metrics-sharelatex": "^2.1.1",
"minimist": "1.2.0",
"mmmagic": "^0.5.2",
"mocha": "^5.0.1",
@@ -90,7 +91,7 @@
"pug": "^2.0.0-beta6",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4",
"redis-sharelatex": "^1.0.5",
"request": "^2.69.0",
"requestretry": "^1.13.0",
"requests": "^0.1.7",
@@ -98,7 +99,7 @@
"rolling-rate-limiter": "git+https://github.com/ShaneKilkelly/rolling-rate-limiter.git#master",
"sanitizer": "0.1.1",
"sequelize": "^3.2.0",
"settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
"settings-sharelatex": "^1.1.0",
"sixpack-client": "^1.0.0",
"temp": "^0.8.3",
"underscore": "1.6.0",