Skip to content

Commit 9a92634

Browse files
committed
Adding packageDir so peer can find chaincode there and commenting deployment descriptor specific for Mac M1
Signed-off-by: munapower <mmunaro@hotmail.com>
1 parent 0f5ba45 commit 9a92634

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

samples/deployment/k8s/generate.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ outDir="."
3131
cryptoConfigDir="${outDir}/crypto-config"
3232
channelArtifactsDir="${outDir}/channel-artifacts"
3333
packageDir="${outDir}/packages"
34+
mkdir packageDir
3435

3536
CHAINCODE_SERVER_PORT=9999
3637

@@ -99,7 +100,9 @@ METADATA-EOF
99100
# PACKAGE_ID=$(peer lifecycle chaincode calculatepackageid ${CC_NAME}.tar.gz)
100101
# commenting due to the network not yet being setup to calculate package_id
101102

102-
successln "Chaincode is packaged ${address}"
103+
mv $CC_NAME.tar.gz packageDir
104+
successln "Chaincode is packaged ${address} and in ${packageDir}/$CC_NAME.tar.gz"
105+
103106
}
104107

105108
CC_TYPE="ccaas"
@@ -133,5 +136,6 @@ do
133136
packageChaincode "${peer}"
134137
done
135138

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

samples/deployment/k8s/org1/org1-fpcclient-deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ spec:
6767
- mountPath: /opt/gopath/src/github.com/hyperledger/fabric-private-chaincode/
6868
name: fpc-claim
6969
workingDir: /opt/gopath/src/github.com/hyperledger/fabric/peer
70+
# nodeSelector:
71+
# kubernetes.io/arch: amd64
72+
# test to see if minikube can start a docker amd64 image even though it is running arm64
7073
restartPolicy: Always
7174
volumes:
7275
- name: fpcclient-claim3

0 commit comments

Comments
 (0)