epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-17 15:35:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename --channel-id to --channelID in osadmin

Browse source 
Signed-off-by: Julian Castrence <juliancastrence@ibm.com>
This commit is contained in:
Julian Castrence 2021-01-27 10:29:24 -05:00 committed by denyeart
parent 6875049c8d
commit 51f76977b0
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci/azure-pipelines.yml
View file

@ -7,7 +7,7 @@ trigger:
- release-1.4 - release-1.4
variables: variables:
FABRIC_VERSION: 2.3 FABRIC_VERSION: 2.4
GO_BIN: $(Build.Repository.LocalPath)/bin GO_BIN: $(Build.Repository.LocalPath)/bin
GO_VER: 1.14.6 GO_VER: 1.14.6
NODE_VER: 12.x NODE_VER: 12.x

2
ci/scripts/pullFabricImages.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
set -euo pipefail set -euo pipefail
FABRIC_VERSION=${FABRIC_VERSION:-2.3} FABRIC_VERSION=${FABRIC_VERSION:-2.4}
STABLE_TAG=amd64-${FABRIC_VERSION}-stable STABLE_TAG=amd64-${FABRIC_VERSION}-stable
for image in baseos peer orderer ca tools orderer ccenv javaenv nodeenv tools; do for image in baseos peer orderer ca tools orderer ccenv javaenv nodeenv tools; do

2
ci/scripts/run-test-network-basic.sh
View file

@ -1,6 +1,6 @@
set -euo pipefail set -euo pipefail
FABRIC_VERSION=${FABRIC_VERSION:-2.3} FABRIC_VERSION=${FABRIC_VERSION:-2.4}
CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go} CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go}
CHAINCODE_NAME=${CHAINCODE_NAME:-basic} CHAINCODE_NAME=${CHAINCODE_NAME:-basic}
CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-basic} CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-basic}

2
ci/scripts/run-test-network-events.sh
View file

@ -1,6 +1,6 @@
set -euo pipefail set -euo pipefail
FABRIC_VERSION=${FABRIC_VERSION:-2.3} FABRIC_VERSION=${FABRIC_VERSION:-2.4}
CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-javascript} CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-javascript}
CHAINCODE_NAME=${CHAINCODE_NAME:-events} CHAINCODE_NAME=${CHAINCODE_NAME:-events}
CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-events} CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-events}

2
ci/scripts/run-test-network-ledger.sh
View file

@ -1,6 +1,6 @@
set -euo pipefail set -euo pipefail
FABRIC_VERSION=${FABRIC_VERSION:-2.3} FABRIC_VERSION=${FABRIC_VERSION:-2.4}
CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go} CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go}
CHAINCODE_NAME=${CHAINCODE_NAME:-ledger} CHAINCODE_NAME=${CHAINCODE_NAME:-ledger}
CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-ledger-queries} CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-ledger-queries}

2
ci/scripts/run-test-network-private.sh
View file

@ -1,6 +1,6 @@
set -euo pipefail set -euo pipefail
FABRIC_VERSION=${FABRIC_VERSION:-2.3} FABRIC_VERSION=${FABRIC_VERSION:-2.4}
CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go} CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go}
CHAINCODE_NAME=${CHAINCODE_NAME:-private} CHAINCODE_NAME=${CHAINCODE_NAME:-private}
CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-private-data} CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-private-data}

2
ci/scripts/run-test-network-sbe.sh
View file

@ -1,6 +1,6 @@
set -euo pipefail set -euo pipefail
FABRIC_VERSION=${FABRIC_VERSION:-2.3} FABRIC_VERSION=${FABRIC_VERSION:-2.4}
CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-typescript} CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-typescript}
CHAINCODE_NAME=${CHAINCODE_NAME:-sbe} CHAINCODE_NAME=${CHAINCODE_NAME:-sbe}
CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-sbe} CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-sbe}

2
ci/scripts/run-test-network-secured.sh
View file

@ -1,6 +1,6 @@
set -euo pipefail set -euo pipefail
FABRIC_VERSION=${FABRIC_VERSION:-2.3} FABRIC_VERSION=${FABRIC_VERSION:-2.4}
CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go} CHAINCODE_LANGUAGE=${CHAINCODE_LANGUAGE:-go}
CHAINCODE_NAME=${CHAINCODE_NAME:-secured} CHAINCODE_NAME=${CHAINCODE_NAME:-secured}
CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-secured-agreement} CHAINCODE_PATH=${CHAINCODE_PATH:-../asset-transfer-secured-agreement}

2
test-network/scripts/createChannel.sh
View file

@ -37,7 +37,7 @@ createChannel() {
while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ] ; do while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ] ; do
sleep $DELAY sleep $DELAY
set -x set -x
osnadmin channel join --channel-id $CHANNEL_NAME --config-block ./channel-artifacts/${CHANNEL_NAME}.block -o localhost:7053 --ca-file "$ORDERER_CA" --client-cert "$ORDERER_ADMIN_TLS_SIGN_CERT" --client-key "$ORDERER_ADMIN_TLS_PRIVATE_KEY" >&log.txt osnadmin channel join --channelID $CHANNEL_NAME --config-block ./channel-artifacts/${CHANNEL_NAME}.block -o localhost:7053 --ca-file "$ORDERER_CA" --client-cert "$ORDERER_ADMIN_TLS_SIGN_CERT" --client-key "$ORDERER_ADMIN_TLS_PRIVATE_KEY" >&log.txt
res=$? res=$?
{ set +x; } 2>/dev/null { set +x; } 2>/dev/null
let rc=$res let rc=$res