Skip to content

Commit d315327

Browse files
committed
feat(chaincode-dev): Update scripte and fix port
Signed-off-by: Osama Rabea <[email protected]>
1 parent 64cf9b1 commit d315327

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

samples/chaincodes/java-chaincode/run-dev.sh

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ CHAINCODE_NAME="chaincode1"
77
CHAINCODE_VERSION="0.0.1"
88
CHANNEL_NAME="my-channel1"
99
PEER_NAME="peer0.org1.example.com"
10-
JAR_PATH="build/libs/chaincode-all.jar"
11-
CHAINCODE_PORT=7041
10+
and JAR_PATH="build/libs/chaincode-all.jar"
1211

1312
# ========== CHECK COMMANDS ==========
14-
for cmd in docker java grep gradle; do
13+
for cmd in docker java grep gradle awk; do
1514
if ! command -v $cmd &>/dev/null; then
1615
echo "Error: '$cmd' command not found. Please install it first."
1716
exit 1
@@ -34,13 +33,16 @@ if ! docker ps | grep -q "$PEER_NAME"; then
3433
exit 1
3534
fi
3635

37-
# ========== GET PEER IP ==========
38-
PEER_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $PEER_NAME)
39-
if [ -z "$PEER_IP" ]; then
40-
echo "Error: Could not find $PEER_NAME IP address."
36+
# ========== GET DYNAMIC CHAINCODE PORT FROM DOCKER ==========
37+
CHAINCODE_PORT=$(docker port "$PEER_NAME" 7050 | grep '0.0.0.0' | awk -F: '{print $2}' | head -n1)
38+
39+
if [ -z "$CHAINCODE_PORT" ]; then
40+
echo "Error: Could not find mapped host port for container port 7050."
4141
exit 1
4242
fi
4343

44+
PEER_IP="0.0.0.0"
45+
4446
echo "Testing connectivity to peer at $PEER_IP:$CHAINCODE_PORT..."
4547
if ! nc -z $PEER_IP $CHAINCODE_PORT 2>/dev/null; then
4648
echo "Error: Cannot connect to peer chaincode port $PEER_IP:$CHAINCODE_PORT."
@@ -54,7 +56,7 @@ export CORE_CHAINCODE_ID_NAME="$CHAINCODE_NAME:$CHAINCODE_VERSION"
5456
export CORE_CHAINCODE_LOGGING_LEVEL="DEBUG"
5557
export CORE_CHAINCODE_LOGGING_SHIM="debug"
5658
export CORE_PEER_ADDRESS="$PEER_IP:$CHAINCODE_PORT"
57-
export CORE_PEER_LOCALMSPID="Org1MSP"
59+
export CORE_PEER_LOCALMSPID="Org1MSP"
5860
export CORE_PEER_TLS_ENABLED=false
5961
export CORE_CHAINCODE_LOGLEVEL=debug
6062
export FABRIC_LOGGING_SPEC=debug
@@ -66,11 +68,11 @@ echo "Chaincode Name: $CORE_CHAINCODE_ID_NAME"
6668
echo "Peer Address: $CORE_PEER_ADDRESS"
6769
echo "========================================"
6870

69-
if java -jar "$JAR_PATH" -peer.address $PEER_IP:7041; then
71+
if java -jar "$JAR_PATH" -peer.address $PEER_IP:$CHAINCODE_PORT; then
7072
echo "========================================"
7173
echo "Successfully running Java in dev Mode"
7274
echo "========================================"
7375
else
7476
echo "Error: Failed to start the chaincode JAR"
7577
exit 1
76-
fi
78+
fi

samples/java-dev-mode-sample.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.2.0/schema.json",
33
"global": {
4-
"fabricVersion": "2.3.2",
4+
"fabricVersion": "2.4.3",
55
"tls": false,
66
"peerDevMode": true
77
},
@@ -52,13 +52,11 @@
5252
],
5353
"chaincodes": [
5454
{
55-
"name": "simple-asset",
56-
"version": "1.0",
55+
"name": "chaincode1",
56+
"version": "0.0.1",
5757
"lang": "java",
5858
"channel": "mychannel",
59-
"directory": "./samples/java-chaincode",
60-
"endorsement": "AND ('Org1MSP.member')",
61-
"init": "{\"Args\":[]}"
59+
"directory": "./chaincodes/java-chaincode"
6260
}
6361
]
6462
}

0 commit comments

Comments
 (0)