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

fix to replace 443 with NGINX_HTTPS_PORT (#745)

Browse source 
Signed-off-by: fiadanza <francesco.iadanza@gmail.com>
This commit is contained in:
fiadanza 2022-05-19 12:16:39 +02:00 committed by GitHub
parent eb0a616261
commit 8662b10c58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test-network-k8s/scripts/chaincode.sh
View file

@ -161,7 +161,7 @@ function invoke_chaincode() {
-n $cc_name \ -n $cc_name \
-C $CHANNEL_NAME \ -C $CHANNEL_NAME \
-c $@ \ -c $@ \
--orderer org0-orderer1.${DOMAIN}:443 \ --orderer org0-orderer1.${DOMAIN}:${NGINX_HTTPS_PORT} \
--connTimeout ${ORDERER_TIMEOUT} \ --connTimeout ${ORDERER_TIMEOUT} \
--tls --cafile ${TEMP_DIR}/channel-msp/ordererOrganizations/org0/orderers/org0-orderer1/tls/signcerts/tls-cert.pem --tls --cafile ${TEMP_DIR}/channel-msp/ordererOrganizations/org0/orderers/org0-orderer1/tls/signcerts/tls-cert.pem
@ -301,7 +301,7 @@ function approve_chaincode() {
--version 1 \ --version 1 \
--package-id ${cc_id} \ --package-id ${cc_id} \
--sequence 1 \ --sequence 1 \
--orderer org0-orderer1.${DOMAIN}:443 \ --orderer org0-orderer1.${DOMAIN}:${NGINX_HTTPS_PORT} \
--connTimeout ${ORDERER_TIMEOUT} \ --connTimeout ${ORDERER_TIMEOUT} \
--tls --cafile ${TEMP_DIR}/channel-msp/ordererOrganizations/org0/orderers/org0-orderer1/tls/signcerts/tls-cert.pem --tls --cafile ${TEMP_DIR}/channel-msp/ordererOrganizations/org0/orderers/org0-orderer1/tls/signcerts/tls-cert.pem
@ -323,7 +323,7 @@ function commit_chaincode() {
--name ${cc_name} \ --name ${cc_name} \
--version 1 \ --version 1 \
--sequence 1 \ --sequence 1 \
--orderer org0-orderer1.${DOMAIN}:443 \ --orderer org0-orderer1.${DOMAIN}:${NGINX_HTTPS_PORT} \
--connTimeout ${ORDERER_TIMEOUT} \ --connTimeout ${ORDERER_TIMEOUT} \
--tls --cafile ${TEMP_DIR}/channel-msp/ordererOrganizations/org0/orderers/org0-orderer1/tls/signcerts/tls-cert.pem --tls --cafile ${TEMP_DIR}/channel-msp/ordererOrganizations/org0/orderers/org0-orderer1/tls/signcerts/tls-cert.pem

6
test-network-k8s/scripts/channel.sh
View file

@ -105,7 +105,7 @@ function enroll_org_admin() {
CA_AUTH=${username}:${password} CA_AUTH=${username}:${password}
CA_HOST=${CA_NAME}.${DOMAIN} CA_HOST=${CA_NAME}.${DOMAIN}
CA_PORT=443 CA_PORT=${NGINX_HTTPS_PORT}
CA_URL=https://${CA_AUTH}@${CA_HOST}:${CA_PORT} CA_URL=https://${CA_AUTH}@${CA_HOST}:${CA_PORT}
# Read the CA's TLS certificate from the cert-manager CA secret # Read the CA's TLS certificate from the cert-manager CA secret
@ -183,7 +183,7 @@ function create_channel_org_MSP() {
# extract the CA's signing authority from the CA/cainfo response # extract the CA's signing authority from the CA/cainfo response
curl -s \ curl -s \
--cacert ${TEMP_DIR}/cas/${ca_name}/tlsca-cert.pem \ --cacert ${TEMP_DIR}/cas/${ca_name}/tlsca-cert.pem \
https://${ca_name}.${DOMAIN}/cainfo \ https://${ca_name}.${DOMAIN}:${NGINX_HTTPS_PORT}/cainfo \
| jq -r .result.CAChain \ | jq -r .result.CAChain \
| base64 -d \ | base64 -d \
> ${ORG_MSP_DIR}/cacerts/ca-signcert.pem > ${ORG_MSP_DIR}/cacerts/ca-signcert.pem
@ -249,7 +249,7 @@ function join_channel_orderer() {
# The client certificate presented in this case is the admin user's enrollment key. This is a stronger assertion # The client certificate presented in this case is the admin user's enrollment key. This is a stronger assertion
# of identity than the Docker Compose network, which transmits the orderer node's TLS key pair directly # of identity than the Docker Compose network, which transmits the orderer node's TLS key pair directly
osnadmin channel join \ osnadmin channel join \
--orderer-address ${org}-${orderer}-admin.${DOMAIN} \ --orderer-address ${org}-${orderer}-admin.${DOMAIN}:${NGINX_HTTPS_PORT} \
--ca-file ${TEMP_DIR}/channel-msp/ordererOrganizations/${org}/orderers/${org}-${orderer}/tls/signcerts/tls-cert.pem \ --ca-file ${TEMP_DIR}/channel-msp/ordererOrganizations/${org}/orderers/${org}-${orderer}/tls/signcerts/tls-cert.pem \
--client-cert ${TEMP_DIR}/enrollments/${org}/users/${org}admin/msp/signcerts/cert.pem \ --client-cert ${TEMP_DIR}/enrollments/${org}/users/${org}admin/msp/signcerts/cert.pem \
--client-key ${TEMP_DIR}/enrollments/${org}/users/${org}admin/msp/keystore/key.pem \ --client-key ${TEMP_DIR}/enrollments/${org}/users/${org}admin/msp/keystore/key.pem \

2
test-network-k8s/scripts/utils.sh
View file

@ -100,7 +100,7 @@ function export_peer_context() {
local peer=$2 local peer=$2
export FABRIC_CFG_PATH=${PWD}/config/${org} export FABRIC_CFG_PATH=${PWD}/config/${org}
export CORE_PEER_ADDRESS=${org}-${peer}.${DOMAIN}:443 export CORE_PEER_ADDRESS=${org}-${peer}.${DOMAIN}:${NGINX_HTTPS_PORT}
export CORE_PEER_MSPCONFIGPATH=${TEMP_DIR}/enrollments/${org}/users/${org}admin/msp export CORE_PEER_MSPCONFIGPATH=${TEMP_DIR}/enrollments/${org}/users/${org}admin/msp
export CORE_PEER_TLS_ROOTCERT_FILE=${TEMP_DIR}/channel-msp/peerOrganizations/${org}/msp/tlscacerts/tlsca-signcert.pem export CORE_PEER_TLS_ROOTCERT_FILE=${TEMP_DIR}/channel-msp/peerOrganizations/${org}/msp/tlscacerts/tlsca-signcert.pem
} }