Mobrovac has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395730 )
Change subject: Update restbase to 1a71389
......................................................................
Update restbase to 1a71389
List of changes:
1a71389 Add configurable new summary endpoint and fix eslint
xxxxxxx Update node module dependencies
Change-Id: Icd506854649307e9a3742df6adb71b5715e86196
---
M node_modules/content-type/package.json
M node_modules/json-stable-stringify/package.json
M node_modules/kad/package.json
M node_modules/restbase-mod-table-cassandra-ng/package.json
M node_modules/restbase-mod-table-spec-ng/package.json
M node_modules/service-runner/lib/docker.js
M node_modules/service-runner/package.json
M node_modules/swagger-ui/package.json
M restbase
9 files changed, 20 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/30/395730/1
diff --git a/node_modules/content-type/package.json
b/node_modules/content-type/package.json
index f0d919c..2c73deb 100644
--- a/node_modules/content-type/package.json
+++ b/node_modules/content-type/package.json
@@ -49,7 +49,7 @@
"/"
],
"_resolved":
"git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b";,
- "_shasum": "812a35b5360941d2da4b674807d99cc60da9e595",
+ "_shasum": "bc530ae7742a43bc2b90ecb0b95130ebf8d29b62",
"_shrinkwrap": null,
"_spec":
"content-type@git+https://github.com/wikimedia/content-type.git#master";,
"_where": "/opt/service",
diff --git a/node_modules/json-stable-stringify/package.json
b/node_modules/json-stable-stringify/package.json
index bd1e93b..9ee81ba 100644
--- a/node_modules/json-stable-stringify/package.json
+++ b/node_modules/json-stable-stringify/package.json
@@ -51,7 +51,7 @@
"/restbase-mod-table-cassandra-ng"
],
"_resolved":
"git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f";,
- "_shasum": "31107cfb1ff8d9d9097ce666a6147942e60b6a8b",
+ "_shasum": "8b533632991cade45418caae1cf7ca5663d50916",
"_shrinkwrap": null,
"_spec":
"json-stable-stringify@git+https://github.com/wikimedia/json-stable-stringify.git#master";,
"_where": "/opt/service",
diff --git a/node_modules/kad/package.json b/node_modules/kad/package.json
index 861f01c..91b17f8 100644
--- a/node_modules/kad/package.json
+++ b/node_modules/kad/package.json
@@ -49,7 +49,7 @@
"/limitation"
],
"_resolved":
"git+https://github.com/gwicke/kad.git#936c91652d757ea6f9dd30e44698afb0daaa1d17";,
- "_shasum": "d62944e0f9519d4408800d1f3a2c9e10497a11b4",
+ "_shasum": "730448b50b13ed895f55127045cf1f7c9e735a6a",
"_shrinkwrap": null,
"_spec": "kad@git+https://github.com/gwicke/kad.git#master";,
"_where": "/opt/service/node_modules/limitation",
diff --git a/node_modules/restbase-mod-table-cassandra-ng/package.json
b/node_modules/restbase-mod-table-cassandra-ng/package.json
index 86b5e0f..01122fb 100644
--- a/node_modules/restbase-mod-table-cassandra-ng/package.json
+++ b/node_modules/restbase-mod-table-cassandra-ng/package.json
@@ -49,7 +49,7 @@
"/"
],
"_resolved":
"git+https://github.com/wikimedia/restbase-mod-table-cassandra.git#b3492319daecfb269c5b2082ee1b5df1c0deb7b6";,
- "_shasum": "3271d02d6c937a71fea6dca868c1e2d7364e8525",
+ "_shasum": "9df3d864c0ac15570a533993d92825d8f3007f1d",
"_shrinkwrap": null,
"_spec":
"restbase-mod-table-cassandra-ng@git+https://github.com/wikimedia/restbase-mod-table-cassandra.git#redesign";,
"_where": "/opt/service",
diff --git a/node_modules/restbase-mod-table-spec-ng/package.json
b/node_modules/restbase-mod-table-spec-ng/package.json
index 33adc43..36458fc 100644
--- a/node_modules/restbase-mod-table-spec-ng/package.json
+++ b/node_modules/restbase-mod-table-spec-ng/package.json
@@ -49,7 +49,7 @@
"/restbase-mod-table-cassandra-ng"
],
"_resolved":
"git+https://github.com/wikimedia/restbase-mod-table-spec.git#aa0a252e8de67dda822923236d2b54b9b945ae90";,
- "_shasum": "12b21970c89975e6b15124c2bffcf946f7aefb0d",
+ "_shasum": "79c5f314cfdb1b88d4e15c6b813a46fdd36c1153",
"_shrinkwrap": null,
"_spec":
"restbase-mod-table-spec-ng@git+https://github.com/wikimedia/restbase-mod-table-spec.git#redesign";,
"_where": "/opt/service/node_modules/restbase-mod-table-cassandra-ng",
diff --git a/node_modules/service-runner/lib/docker.js
b/node_modules/service-runner/lib/docker.js
index d964c26..fe442c2 100644
--- a/node_modules/service-runner/lib/docker.js
+++ b/node_modules/service-runner/lib/docker.js
@@ -110,7 +110,7 @@
*/
function createDockerFile() {
- const extraPkgs = ['nodejs', 'nodejs-legacy', 'git', 'wget',
'build-essential'];
+ const extraPkgs = ['nodejs', 'nodejs-legacy', 'git', 'wget',
'build-essential', 'npm'];
// An array where we store custom-sourced extra packages
// Each element has 'repo_url', 'release', 'pool' and 'packages' properties
// 'packages' is an array of package names
@@ -148,9 +148,6 @@
process.exit(2);
}
- if (nodeVersion === 'system') {
- extraPkgs.push('npm');
- }
// get any additional packages that need to be installed
Object.keys(pkg.deploy.dependencies).forEach((sys) => {
if (sys === '_all' || (sys === baseImg || (new
RegExp(sys)).test(baseImg))) {
diff --git a/node_modules/service-runner/package.json
b/node_modules/service-runner/package.json
index 32dfc45..b3395de 100644
--- a/node_modules/service-runner/package.json
+++ b/node_modules/service-runner/package.json
@@ -14,19 +14,19 @@
]
],
"_from": "service-runner@>=2.3.0 <3.0.0",
- "_id": "service-runner@2.4.7",
+ "_id": "service-runner@2.4.8",
"_inCache": true,
"_location": "/service-runner",
- "_nodeVersion": "4.8.0",
+ "_nodeVersion": "6.11.1",
"_npmOperationalInternal": {
"host": "s3://npm-registry-packages",
- "tmp": "tmp/service-runner-2.4.7.tgz_1512421662286_0.3225941325072199"
+ "tmp": "tmp/service-runner-2.4.8.tgz_1512564897061_0.8217372330836952"
},
"_npmUser": {
- "name": "pchelolo",
- "email": "petrpche...@gmail.com"
+ "name": "doorman",
+ "email": "marko.obro...@gmail.com"
},
- "_npmVersion": "2.15.11",
+ "_npmVersion": "3.10.10",
"_phantomChildren": {},
"_requested": {
"raw": "service-runner@^2.3.0",
@@ -40,8 +40,8 @@
"_requiredBy": [
"/"
],
- "_resolved":
"https://registry.npmjs.org/service-runner/-/service-runner-2.4.7.tgz";,
- "_shasum": "938ebcf1d288ed412fafe64b89f428a14f791ece",
+ "_resolved":
"https://registry.npmjs.org/service-runner/-/service-runner-2.4.8.tgz";,
+ "_shasum": "5dd23353bc85bd128ed50b9d5f224ff99b5e8388",
"_shrinkwrap": null,
"_spec": "service-runner@^2.3.0",
"_where": "/opt/service",
@@ -82,13 +82,13 @@
},
"directories": {},
"dist": {
- "shasum": "938ebcf1d288ed412fafe64b89f428a14f791ece",
- "tarball":
"https://registry.npmjs.org/service-runner/-/service-runner-2.4.7.tgz";
+ "shasum": "5dd23353bc85bd128ed50b9d5f224ff99b5e8388",
+ "tarball":
"https://registry.npmjs.org/service-runner/-/service-runner-2.4.8.tgz";
},
"engines": {
"node": ">=4.2.2"
},
- "gitHead": "4dc4d49a82bf983dcef59e17beb4e237626fb93f",
+ "gitHead": "35507c65841fe001ac4d1c54f92fa24d7ba10e0a",
"homepage": "https://github.com/wikimedia/service-runner";,
"keywords": [
"supervisor",
@@ -124,5 +124,5 @@
"start": "./service-runner.js",
"test": "mocha"
},
- "version": "2.4.7"
+ "version": "2.4.8"
}
diff --git a/node_modules/swagger-ui/package.json
b/node_modules/swagger-ui/package.json
index 657f252..43911cb 100644
--- a/node_modules/swagger-ui/package.json
+++ b/node_modules/swagger-ui/package.json
@@ -49,7 +49,7 @@
"/hyperswitch"
],
"_resolved":
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541";,
- "_shasum": "9bb3e2cadc0b00398b7021629e64d6f06530505b",
+ "_shasum": "9befeafb00990e20bdf85e3030cdfe1b78fd51c7",
"_shrinkwrap": null,
"_spec": "swagger-ui@git+https://github.com/wikimedia/swagger-ui.git#master";,
"_where": "/opt/service/node_modules/hyperswitch",
diff --git a/restbase b/restbase
index 4c044d5..1a71389 160000
--- a/restbase
+++ b/restbase
@@ -1 +1 @@
-Subproject commit 4c044d51bf98537a3381c8c211c2105343892d4a
+Subproject commit 1a71389f1e798ec046fe63aa0145a777b70f1773
--
To view, visit https://gerrit.wikimedia.org/r/395730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd506854649307e9a3742df6adb71b5715e86196
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
