Skip to content

Commit d2bbd36

Browse files
committed
fix: correct docker-entrypoint and remove unused testify dep in asset-transfer-go
1 parent 2d376f1 commit d2bbd36

2 files changed

Lines changed: 16 additions & 13 deletions

File tree

full-stack-asset-transfer-guide/contracts/asset-transfer-go/docker/docker-entrypoint.sh

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,22 @@ if [[ ! -v CHAINCODE_SERVER_ADDRESS ]]; then
99
exec ./chaincode --peer.address "${CORE_PEER_ADDRESS}"
1010

1111
elif [[ "${CORE_PEER_TLS_ENABLED,,}" == "true" ]]; then
12-
# CaaS + TLS
13-
exec ./chaincode \
14-
--chaincode.address "${CHAINCODE_SERVER_ADDRESS}" \
15-
--chaincode.id "${CHAINCODE_ID}" \
16-
--chaincode.tls.enabled true \
17-
--chaincode.tls.key.file "${CHAINCODE_TLS_KEY:-/hyperledger/privatekey.pem}" \
18-
--chaincode.tls.cert.file "${CHAINCODE_TLS_CERT:-/hyperledger/cert.pem}" \
19-
--chaincode.tls.clientCaCert.file "${CHAINCODE_TLS_CLIENT_CACERT:-/hyperledger/rootcert.pem}"
12+
# CaaS + TLS: fabric-chaincode-go/v2 reads CHAINCODE_SERVER_ADDRESS,
13+
# CORE_CHAINCODE_ID_NAME, and TLS vars directly as env vars.
14+
exec env \
15+
CORE_CHAINCODE_ID_NAME="${CHAINCODE_ID}" \
16+
CHAINCODE_SERVER_ADDRESS="${CHAINCODE_SERVER_ADDRESS}" \
17+
CORE_PEER_TLS_ENABLED=true \
18+
CORE_PEER_TLS_ROOTCERT_FILE="${CHAINCODE_TLS_KEY:-/hyperledger/privatekey.pem}" \
19+
CORE_TLS_CLIENT_KEY_FILE="${CHAINCODE_TLS_CERT:-/hyperledger/cert.pem}" \
20+
CORE_TLS_CLIENT_CERT_FILE="${CHAINCODE_TLS_CLIENT_CACERT:-/hyperledger/rootcert.pem}" \
21+
./chaincode
2022

2123
else
22-
# CaaS without TLS
23-
exec ./chaincode \
24-
--chaincode.address "${CHAINCODE_SERVER_ADDRESS}" \
25-
--chaincode.id "${CHAINCODE_ID}"
24+
# CaaS without TLS: fabric-chaincode-go/v2 uses CHAINCODE_SERVER_ADDRESS
25+
# and CORE_CHAINCODE_ID_NAME env vars to start the gRPC server.
26+
exec env \
27+
CORE_CHAINCODE_ID_NAME="${CHAINCODE_ID}" \
28+
CHAINCODE_SERVER_ADDRESS="${CHAINCODE_SERVER_ADDRESS}" \
29+
./chaincode
2630
fi

full-stack-asset-transfer-guide/contracts/asset-transfer-go/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0
77
github.com/hyperledger/fabric-contract-api-go/v2 v2.2.0
88
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.4
9-
github.com/stretchr/testify v1.10.0
109
google.golang.org/protobuf v1.36.1
1110
)
1211

0 commit comments

Comments
 (0)