Commit graph

14 commits

Author SHA1 Message Date
Gari Singh
a872358668 Merge "[FAB-15723] Fix script and instruction with ccenv" 2019-07-10 09:45:20 +00:00
Tatsuya Sato
8bbdd0faf0 [FAB-15716] Fix instructions for dev-mode
This patch fixes the instructions for dev-mode.

For the commands to start the chaincode to work properly,
this patch modifies the commands.
- Use peer.address flag (instead of the unused env var after FAB-14770)
- Add CORE_PEER_TLS_ENABLED=false (dev-mode is for non-TLS mode only)

FAB-15716 #done

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
Change-Id: I160d22389bb611c5b96ee880497266f06d25abd7
2019-07-03 20:30:26 +00:00
Tatsuya Sato
1774a25de8 [FAB-15723] Fix script and instruction with ccenv
This patch fixes the script and instruction with the ccenv container.

Running chaincode dev-mode fails because bash was removed from the
ccenv by FAB-15670.
This patch changes the command from /bin/bash to /bin/sh.

FAB-15723 #done

Change-Id: Ibf31ce9170e606988302bf46d8dac98b62e2043e
Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2019-06-18 17:42:24 +00:00
Yuki Kondo
7e3d428269 [FAB-14369]Fix dev mode failing to build Chaincode
Building Chaincode fails with the ccenv container created from
Alpine because go build process can't import the shim package.
GOPATH in ccenv changed from "/opt/gopath" to "/go" due to the
move to Alpine. However, docker-compose-simple.yaml still has
`GOPATH=/opt/gopath`.
This CR removes the environment variable.

FAB-14369 #done

Change-Id: I18d9861d9b6f45c1548169fbb143e7883f8ba207
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2019-03-01 01:30:45 +00:00
Arnaud J Le Hors
6007c0974c [FAB-13862] Rename example02 ABstore
Updated chaincode, BYFN, and all other references to example02 to use
the new name ABstore.

Change-Id: I04c177f9de68eb913f4384fd643aa69631143d58
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2019-01-30 09:02:23 +01:00
Matthew Sykes
f67782113d [FAB-13232] fix peer node start command
The -o flag was a legacy option on `peer node start` and has been
removed.

Change-Id: Idf3cf57d39461b57c6f61b32e971e14031278e3f
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2018-12-12 11:14:54 -05:00
Will Lahti
c21bbbaa38 Update samples to use new logging env variables
FAB-12669 #done

Change-Id: Ibb50cc77cb64c3cc138af9afde7273636f34b816
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2018-12-05 15:32:41 -05:00
Yuki Kondo
2f30504769 [FAB-10340] Fix broken link in chaincode-docker-devmode
This CR fixes broken links to the install manual
in fabric-samples/chaincode-docker-devmode/README.rst.
The style is also updated to follow the style of rst.

Change-Id: I9bbb6e0b88b8aabf8e020bb81756f4619115989c
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2018-05-23 19:02:18 +00:00
Robert P. J. Day
9d518fb795 [FAB-9330] Refactor top-level .gitignore into subdirs
Rather than cram most .gitignore content into the top-level .gitignore
file, partition it into lower-level .gitignore files, as is already done
with a couple subdirectories, just to be consistent.

I'm sure these files could be even tidier but this seems sufficient for
a first pass.

Change-Id: I0cc8cb2a9d7fa82c4f6de1aef9f82107c8cc7a6a
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
2018-04-04 06:26:20 -04:00
luomin
90c2bfdca8 [FAB-6934] fix devmode sample for v1.1
Fix the instructions in chain-docker-devmode for v1.1-perview.

Resubmit this FAB-6934 due to the merge conflict.
https://gerrit.hyperledger.org/r/#/c/15405/

Change-Id: I6d2dece3f48ca8b8c904c0745adb2253a7c6581a
Signed-off-by: luomin <luomin_tokyotech@hotmail.com>
2018-02-01 05:36:00 +00:00
Nick Gaski
54ffa5f4c8 [FAB-7241] Fix chaincode-devmode
This CR replaces the expired certificates with the msp library
in fabric/sampleconfig.

Regenerate the orderer.block and myc.tx artifact using the
configtx.yaml in fabric/sampleconfig.  Profiles used are
SampleSingleMSPSolo & SampleSingleMSPChannel.  Modify the
orderer profile in configtxyaml and change address from
127.0.0.1:7050 -> orderer:7050 before reading in the file
to configtxgen.  This allows the peer to
resolve with the ordering service when the docker compose
is spun up.

Change CORE_PEER_ADDRESS from 7051 to 7052 when starting
the chaincode in dev mode.

Change-Id: I0dbd3f81553c85943a4219123f086e69081c4f5a
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
2017-12-15 12:40:48 -05:00
Gari Singh
ba0a098ca6 FAB-5995 Update samples to work with v1.0.2
basic network:
- update docker-compose.yaml to use v1.0.2
- regenerate artifacts

fabcar:
- update creds

chaincode-docker-devmode:
- renegerate channel tx and genesis block

balance-transfer:
- update docker-compose.yaml
- update readme to use download link
- regenerate channel artifacts

Change-Id: I7d52f1afce51ea9e1b115fa287d281af95d9ad85
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2017-09-03 08:08:53 -04:00
Jim Zhang
ca8fad3151 [FAB-5260] Update samples to v1.0.0
basic-network:
 - moved "crypto-config" to top-level and removed
   "network" folder
 - added generate.sh to re-gen crypto materials
 - docker-compose.yaml to ref v1.0.0 images
 - add CLI to docker-compose
 - start.sh to only start CA, orderer, peer and couch
 - startFabric.sh to run start.sh, then launch CLI
   for create channel, install, instantiate, invoke
fabcar:
 - moved chaincode to central chaincode folder
 - moved "creds" to top-level and removed "network"
   folder
 - changed to use the basic-network as the target
   and removed docker-compose.yaml and crypto-config
 - updated package.json to require v1.0.0 modules

- added missing license headers
- restructured to use a central chaincode subdirectory

Change-Id: Ic784d1cf55ea51da5155624f3c38275883de1dca
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>
2017-07-12 09:07:39 -04:00
Nick Gaski
ba777f3bcb [FAB-4371] - Chaincode Dev Mode
Adds a docker environment for running peer in dev mode
pre-baked crypto and orderer/channel artifacts
README still needs an updated curl command to bundle
these scripts.
simplified some of the paths
add sacc from write your first chaincode
remove binary

Change-Id: Ic1537987c819f0350ae6dbf740fd00e1571045e5
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-06-23 13:00:49 -04:00