Skip to content

Updated ibm-blockchain-js #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jansony1 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Updated ibm-blockchain-js #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66e0e87
Updated ibm-blockchain-js
jansony1 Dec 12, 2016
b464608
Update README.md
jansony1 Dec 12, 2016
646caef
Update README.md
jansony1 Dec 12, 2016
60da688
Update app.js
jansony1 Dec 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,19 @@ You may be asked to login again. After login, you will land on the <b>Bluemix Da

&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](readme_images/services2.PNG)

* The 'Cloud Foundry Apps' tile shows the memory you have available for apps. You will require at least 512 MB of free space to deploy an app during the lab. If you do not have 256MB of free space, then delete some existing apps (visible in your dashboard) before proceeding to the next step.
* The 'Cloud Foundry Apps' tile shows the memory you have available for apps. You will require at least 512 MB of free space to



an app during the lab. If you do not have 256MB of free space, then delete some existing apps (visible in your dashboard) before proceeding to the next step.

&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;![](readme_images/services1.PNG)

## Deploy the App

<b>1. Click on the 'Deploy to Bluemix' button below.</b>

&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [![Deploy to Bluemix](https://bluemix.net/deploy/button.png)](https://bluemix.net/deploy?repository=https://github.com/apiBlockchain/GscLabBlockchainApp.git)
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [![Deploy to Bluemix](https://bluemix.net/deploy/button.png)](https://bluemix.net/deploy?repository=https://github.com/jansony1/GscLabBlockchainApp.git)

<b>2. Log in with your Bluemix account.</b>

Expand Down
6 changes: 3 additions & 3 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,11 @@ try {
//var manual = JSON.parse(fs.readFileSync('mycreds_BlockchainAug22.json','utf8'));
//var manual = JSON.parse(fs.readFileSync('my_credsgsclabtest3.json','utf8'));
var manual = JSON.parse(fs.readFileSync('my_credsgsclabtest3.json','utf8'));
peers = manual.credentials.peers;
peers = manual.peers;
users = null; // users are only found if security is on

if (manual.credentials.users)
users = manual.credentials.users;
if (manual.users)
users = manual.users;

console.log('loading hardcoded users');
} catch (e) {
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"debug": "0.7.4",
"express": "4.0.0",
"express-session": "1.2.1",
"ibm-blockchain-js": "1.2.*",
"ibm-blockchain-js": "1.3.2",
"jade": "1.3.1",
"morgan": "1.1.1",
"serve-static": "1.9.2",
Expand All @@ -41,4 +41,4 @@
"name": "IBM GSC FSS"
},
"license": "Apache-2.0"
}
}