Skip to content

Commit

Permalink
[FAB-16521] Move Node.js chaincode to Node.js v12
Browse files Browse the repository at this point in the history
Update the Node.js chaincode to Node.js v12, which
will likely be the current LTS when Fabric v2.0 is
released.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: If93fa27b38b453f22621d975d004745a356653bf
  • Loading branch information
Simon Stone committed Sep 6, 2019
1 parent 3fe2f76 commit 8dade07
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 61 deletions.
2 changes: 1 addition & 1 deletion build/docker.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const shell = require('gulp-shell');
const util = require('util');

const version = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json'))).version;
const node_version = process.env.NODE_VERSION || '10.15.2';
const node_version = process.env.NODE_VERSION || '12.9.1';
const build_dir = path.join(__dirname, '..', 'fabric-nodeenv');
const tag = version + '-' + git.short();

Expand Down
2 changes: 1 addition & 1 deletion fabric-nodeenv/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
#
ARG NODE_VER=10.15.2
ARG NODE_VER=12.9.1
FROM node:${NODE_VER}-alpine
RUN apk add --no-cache \
make \
Expand Down
69 changes: 42 additions & 27 deletions fabric-shim/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions fabric-shim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@
"types": "./types/index.d.ts",
"license": "Apache-2.0",
"dependencies": {
"@types/google-protobuf": "^3.2.7",
"@fidm/x509": "^1.2.1",
"@types/google-protobuf": "^3.2.7",
"@types/node": "^8.9.4",
"ajv": "^6.5.5",
"fabric-contract-api": "unstable",
"fs-extra": "^7.0.1",
"grpc": "1.19.0",
"grpc": "^1.23.3",
"protobufjs": "5.0.3",
"reflect-metadata": "^0.1.12",
"winston": "^2.4.1",
"yargs": "^10.0.2",
"yargs-parser": "^11.0.0",
"protobufjs": "5.0.3"
"yargs-parser": "^11.0.0"
},
"devDependencies": {
"mocha": "5.2.0",
Expand Down
Loading

0 comments on commit 8dade07

Please sign in to comment.