Merge remote-tracking branch 'origin/next'

.circleci/config.yml

@@ -0,0 +1,39 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: docker:latest
+    steps:
+      - checkout
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - run:
+          name: Docker building
+          command: |
+            if [ "$CIRCLE_BRANCH" = "master" ]; then docker build -t dougley/bezerk:latest .; else docker build -t dougley/bezerk:$CIRCLE_BRANCH .; fi
+            docker login -u $DOCKER_USER -p $DOCKER_PASS
+            if [ "$CIRCLE_BRANCH" = "master" ]; then docker push dougley/bezerk:latest; else docker push dougley/bezerk:$CIRCLE_BRANCH; fi
+  tagged-build:
+    docker:
+      - image: docker:latest
+    steps:
+      - checkout
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - run:
+          name: Docker building
+          command: |
+            docker build -t dougley/bezerk:$(git describe --abbrev=0 --tags) .
+            docker login -u $DOCKER_USER -p $DOCKER_PASS
+            docker push dougley/bezerk:$(git describe --abbrev=0 --tags)
+workflows:
+  version: 2
+  test_n_build:
+    jobs:
+      - build
+      - tagged-build:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /v.+/

.eslintrc.json

@@ -1,8 +1,3 @@
 {
-    "extends": "standard",
-    "installedESLint": true,
-    "plugins": [
-        "standard",
-        "promise"
-    ]
+  "extends": "standard"
 }

.gitignore

@@ -2,29 +2,63 @@
 logs
 *.log
 npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
 # Runtime data
 pids
 *.pid
 *.seed
+*.pid.lock
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
 # Coverage directory used by tools like istanbul
 coverage
 
+# nyc test coverage
+.nyc_output
+
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
+# Bower dependency directory (https://bower.io/)
+bower_components
+
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
+# Compiled binary addons (https://nodejs.org/api/addons.html)
 build/Release
 
-# Dependency directory
-# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
-node_modules
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# next.js build output
+.next
 
-config.json
+# idea files
+.idea

Dockerfile

@@ -0,0 +1,14 @@
+FROM node:9
+MAINTAINER hello@dougley.com
+
+WORKDIR /app
+
+CMD ["node", "index.js"]
+
+COPY package.json /app/
+
+# Create working dir
+RUN mkdir -p /app
+COPY . /app
+
+RUN npm i