Skip to content

Commit 2367115

Browse files
committed
update chaincode create in k8s sample
Signed-off-by: munapower <mmunaro@hotmail.com>
1 parent 8165257 commit 2367115

1 file changed

Lines changed: 19 additions & 5 deletions

File tree

samples/deployment/k8s/generate.sh

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33
# Copyright IBM Corp. All Rights Reserved.
44
# SPDX-License-Identifier: Apache-2.0
55

6+
C_RESET='\033[0m'
7+
C_RED='\033[0;31m'
8+
C_GREEN='\033[0;32m'
9+
C_BLUE='\033[0;34m'
10+
C_YELLOW='\033[1;33m'
11+
# successln echos in green color
12+
function successln() {
13+
println "${C_GREEN}${1}${C_RESET}"
14+
}
15+
# println echos string
16+
function println() {
17+
echo -e "$1"
18+
}
619
set -euo pipefail
720

821
if [[ -z "${FPC_PATH}" ]]; then
@@ -21,7 +34,7 @@ packageDir="${outDir}/packages"
2134

2235
CHAINCODE_SERVER_PORT=9999
2336

24-
FABRIC_BIN_DIR="${FABRIC_BIN_DIR:-${FABRIC_PATH}/build/bin}"
37+
FABRIC_BIN_DIR="${FPC_PATH}/fabric/_internal/bin"
2538
if [[ -z "${FABRIC_BIN_DIR}" ]]; then
2639
echo "Error: FABRIC_BIN_DIR not set"
2740
echo "Error: FABRIC_BIN_DIR must point to the location of cryptogen and configtxgen"
@@ -83,7 +96,8 @@ METADATA-EOF
8396
tar -C "$tempdir/pkg" -czf "$CC_NAME.tar.gz" metadata.json code.tar.gz
8497
rm -Rf "$tempdir"
8598

86-
PACKAGE_ID=$(peer lifecycle chaincode calculatepackageid ${CC_NAME}.tar.gz)
99+
# PACKAGE_ID=$(peer lifecycle chaincode calculatepackageid ${CC_NAME}.tar.gz)
100+
# commenting due to the network not yet being setup to calculate package_id
87101

88102
successln "Chaincode is packaged ${address}"
89103
}
@@ -105,7 +119,7 @@ for peer in $(shopt -s globstar; find ${cryptoConfigDir}/**/peers/ -mindepth 1 -
105119
do
106120
# ercc
107121
CC_NAME=ERCC_ID
108-
CC_VER=ERCC_VER
122+
CC_VERSION=ERCC_VER
109123
# endpoint="${ERCC_ID}-${peer}:${CHAINCODE_SERVER_PORT}"
110124
# packageName="${ERCC_ID}-${peer}.tgz"
111125
# packageChaincode "${packageDir}" "${packageName}" "${ERCC_ID}" "${ERCC_VER}" "${CC_TYPE}" "${endpoint}" "${peer}"
@@ -119,5 +133,5 @@ do
119133
packageChaincode "${peer}"
120134
done
121135

122-
echo "Store mrenclave for fpccc"
123-
echo "FPC_MRENCLAVE=${FPC_MRENCLAVE}" >> ${packageDir}/chaincode-config.properties
136+
#echo "Store mrenclave for fpccc"
137+
#echo "FPC_MRENCLAVE=${FPC_MRENCLAVE}" >> ${packageDir}/chaincode-config.properties

0 commit comments

Comments
 (0)