Merge 1815d2b into fe45940

HabitRPG · Oct 31, 2018 · 37a07bd · 37a07bd
2 parents fe45940 + 1815d2b
commit 37a07bd
Show file tree

Hide file tree

Showing 6 changed files with 216 additions and 202 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8
+10
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '8'
+  - '10'
 services:
   - mongodb
 cache:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 
 ENV ADMIN_EMAIL admin@habitica.com
 ENV AMAZON_PAYMENTS_CLIENT_ID amzn1.application-oa2-client.68ed9e6904ef438fbc1bf86bf494056e

diff --git a/Dockerfile-Dev b/Dockerfile-Dev
@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 
 # Install global packages
 RUN npm install -g gulp-cli mocha