Skip to content

Commit 8165257

Browse files
committed
add updated chaincode packaging
Signed-off-by: munapower <mmunaro@hotmail.com>
1 parent 8c84418 commit 8165257

1 file changed

Lines changed: 45 additions & 6 deletions

File tree

samples/deployment/k8s/generate.sh

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,40 @@ do
5454
done
5555

5656
echo "Package ercc and fpccc"
57+
function packageChaincode() {
58+
59+
address="{{.peername}}_${CC_NAME}_ccaas:${CHAINCODE_SERVER_PORT}"
60+
prefix=$(basename "$0")
61+
tempdir=$(mktemp -d -t "$prefix.XXXXXXXX") || error_exit "Error creating temporary directory"
62+
label=${CC_NAME}_${CC_VERSION}
63+
mkdir -p "$tempdir/src"
64+
65+
cat > "$tempdir/src/connection.json" <<CONN_EOF
66+
{
67+
"address": "${address}",
68+
"dial_timeout": "10s",
69+
"tls_required": false
70+
}
71+
CONN_EOF
72+
73+
mkdir -p "$tempdir/pkg"
74+
75+
cat << METADATA-EOF > "$tempdir/pkg/metadata.json"
76+
{
77+
"type": "ccaas",
78+
"label": "$label"
79+
}
80+
METADATA-EOF
81+
82+
tar -C "$tempdir/src" -czf "$tempdir/pkg/code.tar.gz" .
83+
tar -C "$tempdir/pkg" -czf "$CC_NAME.tar.gz" metadata.json code.tar.gz
84+
rm -Rf "$tempdir"
85+
86+
PACKAGE_ID=$(peer lifecycle chaincode calculatepackageid ${CC_NAME}.tar.gz)
87+
88+
successln "Chaincode is packaged ${address}"
89+
}
90+
5791
CC_TYPE="ccaas"
5892
ERCC_ID="ercc"
5993
ERCC_VER="1.0"
@@ -70,14 +104,19 @@ FPC_MRENCLAVE="$(cat "${FPCCC_PATH}"/_build/lib/mrenclave)"
70104
for peer in $(shopt -s globstar; find ${cryptoConfigDir}/**/peers/ -mindepth 1 -maxdepth 1 -execdir echo {} ';' | sed 's/^\.\///g');
71105
do
72106
# ercc
73-
endpoint="${ERCC_ID}-${peer}:${CHAINCODE_SERVER_PORT}"
74-
packageName="${ERCC_ID}-${peer}.tgz"
75-
packageChaincode "${packageDir}" "${packageName}" "${ERCC_ID}" "${ERCC_VER}" "${CC_TYPE}" "${endpoint}" "${peer}"
107+
CC_NAME=ERCC_ID
108+
CC_VER=ERCC_VER
109+
# endpoint="${ERCC_ID}-${peer}:${CHAINCODE_SERVER_PORT}"
110+
# packageName="${ERCC_ID}-${peer}.tgz"
111+
# packageChaincode "${packageDir}" "${packageName}" "${ERCC_ID}" "${ERCC_VER}" "${CC_TYPE}" "${endpoint}" "${peer}"
112+
packageChaincode "${peer}"
76113

77114
# fpc cc
78-
endpoint="${FPCCC_ID}-${peer}:${CHAINCODE_SERVER_PORT}"
79-
packageName="${FPCCC_ID}-${peer}.tgz"
80-
packageChaincode "${packageDir}" "${packageName}" "${FPCCC_ID}" "${FPC_MRENCLAVE}" "${CC_TYPE}" "${endpoint}" "${peer}"
115+
CC_NAME=FPCCC_ID
116+
# endpoint="${FPCCC_ID}-${peer}:${CHAINCODE_SERVER_PORT}"
117+
# packageName="${FPCCC_ID}-${peer}.tgz"
118+
# packageChaincode "${packageDir}" "${packageName}" "${FPCCC_ID}" "${FPC_MRENCLAVE}" "${CC_TYPE}" "${endpoint}" "${peer}"
119+
packageChaincode "${peer}"
81120
done
82121

83122
echo "Store mrenclave for fpccc"

0 commit comments

Comments
 (0)