Skip to content

Commit

Permalink
Merge da3afa7 into 1784fd1
Browse files Browse the repository at this point in the history
  • Loading branch information
ottomata committed Jun 17, 2019
2 parents 1784fd1 + da3afa7 commit 0a54f4f
Show file tree
Hide file tree
Showing 58 changed files with 5,050 additions and 2,118 deletions.
31 changes: 30 additions & 1 deletion .eslintrc.yml
@@ -1 +1,30 @@
extends: 'eslint-config-node-services'
extends: 'eslint-config-wikimedia'

parserOptions:
ecmaVersion: 10

env:
node: true

rules:
indent:
- error
- 4
- SwitchCase: 1
MemberExpression: off
space-in-parens: [error, never]
no-multi-spaces: off
no-multiple-empty-lines: off
one-var: off
array-bracket-spacing: off
computed-property-spacing: off
no-unused-vars: [error, {args: none}]
no-underscore-dangle: off
comma-dangle: off
camelcase: off
key-spacing: off
space-before-function-paren: off
quote-props: off
operator-linebreak: off
max-statements-per-line: off
brace-style: off
8 changes: 7 additions & 1 deletion .gitignore
Expand Up @@ -2,5 +2,11 @@ Dockerfile
.idea/
coverage
config.yaml
node_modules
node_modules**
npm-debug.log
*.vscode
*.code-workspace
package-lock.json
.eslintcache
.nyc_output

13 changes: 13 additions & 0 deletions .nycrc
@@ -0,0 +1,13 @@
{
"exclude": [
"test/**",
"lib/util.js",
"lib/kafka.js",
"lib/swagger-ui.js",
"app.js"
],
"reporter": [
"text",
"html"
]
}
50 changes: 50 additions & 0 deletions .pipeline/blubber.yaml
@@ -0,0 +1,50 @@
# Blubber generates repeatable and consistent Dockerfiles
# using multi stage docker images.
# Each variant renders a different Dockerfile.
# https://github.com/wikimedia/blubber
version: v3
base: docker-registry.wikimedia.org/nodejs10-slim
lives:
in: /srv/service
runs:
environment:
APP_BASE_PATH: /srv/service

variants:
# Base build image the other variants start from this.
build:
base: docker-registry.wikimedia.org/nodejs10-devel
apt: { packages: [git, build-essential, python-dev, librdkafka-dev] }
builder:
# Clone Wikimedia schema repositories into /srv/service/schemas
# If you update the schema repository, you'll need to update
# the SHAs that are checked out here, and then rebuild docker images.
command:
- mkdir /srv/service/schemas && git clone --single-branch -- https://gerrit.wikimedia.org/r/mediawiki/event-schemas /srv/service/schemas/mediawiki-event-schemas && cd /srv/service/schemas/mediawiki-event-schemas && git reset --hard eb13353
node: { requirements: [package.json] }
runs:
environment:
BUILD_LIBRDKAFKA: "0"
LINK: g++
# Runs npm test
test:
includes: [build]
entrypoint: [npm, test]
runs: { insecurely: true }
# Same as production, but includes build artifacts and extra packages for debugging.
development:
includes: [build]
apt: { packages: [librdkafka1, librdkafka++1, kafkacat, telnet, iputils-ping, procps, curl, vim] }
runs: { insecurely: true }
entrypoint: [node, server.js]
# prep is used for copying from build to remove build artifacts
# from the production image.
prep:
includes: [build]
node: { env: production }
production:
copies: prep
apt: { packages: [librdkafka1, librdkafka++1] }
node: { env: production }
runs: { environment: { UV_THREADPOOL_SIZE: "128" } }
entrypoint: [node, server.js]
11 changes: 5 additions & 6 deletions .travis.yml
@@ -1,8 +1,7 @@
language: node_js

sudo: false
dist: xenial

language: node_js
node_js:
- "6"
- "8"
- "node"
- "10"

after_success: npm run coveralls

0 comments on commit 0a54f4f

Please sign in to comment.