Merge pull request #56 from pelias/ci-and-nodejs-updates

CI and Node.js updates

.circleci/config.yml

@@ -3,10 +3,10 @@ jobs:
   build:
     working_directory: /app
     docker:
-      - image: docker:17.05.0-ce-git
+      - image: docker:18.06.1-ce-git
     steps:
       - checkout
       - setup_remote_docker
       - run:
           name: Build and push image to Docker Hub
-          command: sh .circleci/docker.sh
+          command: apk --no-cache add curl bash && curl "https://raw.githubusercontent.com/pelias/ci-tools/master/build-docker-images.sh" | bash -

.travis.yml

@@ -3,7 +3,6 @@ language: node_js
 notifications:
   email: false
 node_js:
-  - 6
   - 8
   - 10
 matrix:
@@ -19,4 +18,4 @@ jobs:
     - stage: release
       node_js: 10
       script: curl "https://raw.githubusercontent.com/pelias/ci-tools/master/semantic-release.sh" | bash -
-      if: branch = production
+      if: (branch = master) AND ( type = push )

package.json

@@ -13,7 +13,7 @@
   "author": "Mapzen",
   "license": "MIT",
   "engines": {
-    "node": ">= 6.0.0"
+    "node": ">= 8.0.0"
   },
   "repository": {
     "type": "git",
@@ -44,7 +44,7 @@
     "test"
   ],
   "release": {
-    "branch": "production",
+    "branch": "master",
     "success": []
   }
 }