Bumped node version, replaced bcrypt -> bcryptjs

This commit is contained in:
Wyatt Johnson
2017-07-25 10:01:05 +10:00
parent db183124c9
commit 3e09d28308
6 changed files with 13 additions and 19 deletions
+2 -4
View File
@@ -1,4 +1,4 @@
FROM node:7.10.1
FROM node:latest
# Create app directory
RUN mkdir -p /usr/src/app
@@ -13,11 +13,9 @@ EXPOSE 5000
COPY . /usr/src/app
# Install app dependencies and build static assets.
RUN yarn global add node-gyp && \
yarn install --frozen-lockfile && \
RUN yarn install --frozen-lockfile && \
cli plugins reconcile && \
yarn build && \
yarn install --production && \
yarn cache clean
# Ensure the runtime of the container is in production mode.
+1 -1
View File
@@ -1,6 +1,6 @@
machine:
node:
version: 7.10.1
version: 8
services:
- docker
- redis
+1 -1
View File
@@ -1,5 +1,5 @@
const mongoose = require('../services/mongoose');
const bcrypt = require('bcrypt');
const bcrypt = require('bcryptjs');
const Schema = mongoose.Schema;
const uuid = require('uuid');
const TagLinkSchema = require('./schema/tag_link');
+2 -2
View File
@@ -58,7 +58,7 @@
"accepts": "^1.3.3",
"app-module-path": "^2.2.0",
"async": "^2.5.0",
"bcrypt": "^1.0.2",
"bcryptjs": "^2.4.3",
"body-parser": "^1.17.1",
"bowser": "^1.7.0",
"cli-table": "^0.3.1",
@@ -215,6 +215,6 @@
"webpack": "^2.3.1"
},
"engines": {
"node": "^7.10.1"
"node": "^8"
}
}
+1 -1
View File
@@ -1,6 +1,6 @@
const assert = require('assert');
const uuid = require('uuid');
const bcrypt = require('bcrypt');
const bcrypt = require('bcryptjs');
const url = require('url');
const jwt = require('jsonwebtoken');
const Wordlist = require('./wordlist');
+6 -10
View File
@@ -1181,13 +1181,9 @@ bcrypt-pbkdf@^1.0.0:
dependencies:
tweetnacl "^0.14.3"
bcrypt@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-1.0.2.tgz#d05fc5d223173e0e28ec381c0f00cc25ffaf2736"
dependencies:
bindings "1.2.1"
nan "2.5.0"
node-pre-gyp "0.6.32"
bcryptjs@^2.4.3:
version "2.4.3"
resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
big.js@^3.1.3:
version "3.1.3"
@@ -1197,7 +1193,7 @@ binary-extensions@^1.0.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
bindings@1.2.1, bindings@^1.2.1:
bindings@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
@@ -5445,7 +5441,7 @@ mute-stream@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
nan@2.5.0, nan@^2.0.0, nan@^2.3.0, nan@^2.4.0:
nan@^2.0.0, nan@^2.3.0, nan@^2.4.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8"
@@ -5562,7 +5558,7 @@ node-libs-browser@^2.0.0:
util "^0.10.3"
vm-browserify "0.0.4"
node-pre-gyp@0.6.32, node-pre-gyp@^0.6.29, node-pre-gyp@^0.6.4:
node-pre-gyp@^0.6.29, node-pre-gyp@^0.6.4:
version "0.6.32"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz#fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"
dependencies: