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

Update default Fabric CA version to 1.5.17

Browse source 
Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
This commit is contained in:
Mark S. Lewis 2026-02-07 12:26:08 +00:00
parent 9540c443c8
commit 54128151bc
No known key found for this signature in database
GPG key ID: 8762BF6F1CB31FB5
10 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/actions/fsat-setup/action.yaml vendored
View file

@ -6,16 +6,16 @@ inputs:
default: "lts/*"
just-version:
description: Just Version
default: "1.43.0"
default: "1.46.0"
k9s-version:
description: k9s Version
default: v0.50.15
default: v0.50.18
fabric-version:
description: Version of Hyperledger Fabric
default: "2.5.14"
ca-version:
description: Version of Hyperledger Fabric CA
default: "1.5.15"
default: "1.5.17"
runs:
using: "composite"

2
.github/actions/test-network-setup/action.yaml vendored
View file

@ -15,7 +15,7 @@ inputs:
default: 2.5.14
ca-version:
description: Version of Hyperledger Fabric CA
default: 1.5.15
default: 1.5.17
runs:
using: "composite"

2
full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/Dockerfile
View file

@ -12,7 +12,7 @@ RUN npm install
RUN npm run build && npm shrinkwrap
FROM node:lts as prod-builder
FROM node:lts AS prod-builder
WORKDIR /usr/src/app
COPY --chown=node:node --from=builder /usr/src/app/dist ./dist
COPY --chown=node:node --from=builder /usr/src/app/package.json ./

4
full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/tsconfig.json
View file

@ -8,10 +8,10 @@
"declarationMap": true,
"sourceMap": true,
"outDir": "dist",
"strict": true,
"noUnusedLocals": true,
"noImplicitReturns": true,
"forceConsistentCasingInFileNames": true
"forceConsistentCasingInFileNames": true,
"isolatedModules": true
},
"include": ["src/"]
}

21
full-stack-asset-transfer-guide/infrastructure/kind_with_nginx.sh
View file

@ -21,7 +21,7 @@ set -eo pipefail
set -x
KIND_CLUSTER_NAME=kind
KIND_CLUSTER_IMAGE=${KIND_CLUSTER_IMAGE:-kindest/node:v1.28.0} # Important! k8s v1.25.0 brings breaking changes.
KIND_CLUSTER_IMAGE=${KIND_CLUSTER_IMAGE:-kindest/node:v1.35.1} # Important! k8s v1.25.0 brings breaking changes.
KIND_API_SERVER_ADDRESS=${KIND_API_SERVER_ADDRESS:-127.0.0.1}
KIND_API_SERVER_PORT=${KIND_API_SERVER_PORT:-8888}
CONTAINER_REGISTRY_NAME=${CONTAINER_REGISTRY_NAME:-kind-registry}
@ -78,14 +78,27 @@ networking:
# create a cluster with the local registry enabled in containerd
containerdConfigPatches:
- |-
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:${CONTAINER_REGISTRY_PORT}"]
endpoint = ["http://${CONTAINER_REGISTRY_NAME}:${CONTAINER_REGISTRY_PORT}"]
[plugins."io.containerd.grpc.v1.cri".registry]
config_path = "/etc/containerd/certs.d"
EOF
# Configure registry for containerd 2.x using config_path mode
for node in $(kind get nodes --name $KIND_CLUSTER_NAME);
do
docker exec "$node" mkdir -p "/etc/containerd/certs.d/localhost:${CONTAINER_REGISTRY_PORT}"
docker exec "$node" sh -c "cat > /etc/containerd/certs.d/localhost:${CONTAINER_REGISTRY_PORT}/hosts.toml <<EOT
server = \"http://localhost:${CONTAINER_REGISTRY_PORT}\"
[host.\"http://${CONTAINER_REGISTRY_NAME}:${CONTAINER_REGISTRY_PORT}\"]
capabilities = [\"pull\", \"resolve\", \"push\"]
EOT"
done
#
# Work around a bug in KIND where DNS is not always resolved correctly on machines with IPv6
#
for node in $(kind get nodes);
for node in $(kind get nodes --name $KIND_CLUSTER_NAME);
do
docker exec "$node" sysctl net.ipv4.conf.all.route_localnet=1;
done

6
full-stack-asset-transfer-guide/infrastructure/sample-network/network
View file

@ -34,7 +34,7 @@ function context() {
}
context FABRIC_VERSION 2.5.14
context FABRIC_CA_VERSION 1.5.15
context FABRIC_CA_VERSION 1.5.17
context CLUSTER_RUNTIME kind # or k3s for Rancher
context CONTAINER_CLI docker # or nerdctl for containerd
@ -78,7 +78,7 @@ context CA_IMAGE_LABEL ${FABRIC_CA_VERSION}
#context PEER_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-peer
#context PEER_IMAGE_LABEL ${FABRIC_VERSION}
context PEER_IMAGE ghcr.io/hyperledger-labs/fabric-builder-k8s/k8s-fabric-peer
context PEER_IMAGE_LABEL 0.11.0 # When using k8s-fabric-peer in Fabric v2.5+, 0.11.0+ should be specified
context PEER_IMAGE_LABEL 0.15.1 # When using k8s-fabric-peer in Fabric v2.5+, 0.11.0+ should be specified
context ORDERER_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-orderer
context ORDERER_IMAGE_LABEL ${FABRIC_VERSION}
context OPERATOR_IMAGE ghcr.io/hyperledger-labs/fabric-operator
@ -91,7 +91,7 @@ context COUCHDB_IMAGE couchdb
context COUCHDB_IMAGE_LABEL 3.4.2
context CONSOLE_IMAGE ghcr.io/hyperledger-labs/fabric-console
context CONSOLE_IMAGE_LABEL latest
context DEPLOYER_IMAGE ghcr.io/ibm-blockchain/fabric-deployer
context DEPLOYER_IMAGE ghcr.io/hyperledger-labs/fabric-deployer
context DEPLOYER_IMAGE_LABEL latest-amd64
export FABRIC_OPERATOR_IMAGE=${OPERATOR_IMAGE}:${OPERATOR_IMAGE_LABEL}

4
full-stack-asset-transfer-guide/tests/20-cloud-e2e.sh
View file

@ -332,12 +332,12 @@ fabric-ca-client register \
--id.name $USERNAME \
--id.secret $PASSWORD \
--id.type client \
--url https://$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN \
--url https://$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN:443 \
--tls.certfiles $WORKSHOP_CRYPTO/cas/$ORG-ca/tls-cert.pem \
--mspdir $WORKSHOP_CRYPTO/enrollments/$ORG/users/rcaadmin/msp
fabric-ca-client enroll \
--url https://$USERNAME:$PASSWORD@$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN \
--url https://$USERNAME:$PASSWORD@$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN:443 \
--tls.certfiles $WORKSHOP_CRYPTO/cas/$ORG-ca/tls-cert.pem \
--mspdir $WORKSHOP_CRYPTO/enrollments/$ORG/users/$USERNAME/msp

4
test-network-k8s/docs/BFT_ORDERERS.md
View file

@ -39,8 +39,8 @@ First, run the following command to verify that the environment variables are co
```shell
$ ./network
Fabric image versions: Peer (3.1.1), CA (1.5.15)
Fabric binary versions: Peer (3.1.1), CA (1.5.15)
Fabric image versions: Peer (3.1.1), CA (1.5.17)
Fabric binary versions: Peer (3.1.1), CA (1.5.17)
--- Fabric Information
Fabric Version : 3.1

2
test-network/network.config
View file

@ -1,7 +1,7 @@
# default image tag, example: "2.5.13". "default" will download the latest. (-i)
IMAGETAG="default"
# default ca image tag, example: "1.5.15". "default" will download the latest. (-cai)
# default ca image tag, example: "1.5.17". "default" will download the latest. (-cai)
CA_IMAGETAG="default"
# Using crpto vs CA. default is cryptogen

4
test-network/scripts/utils.sh
View file

@ -18,7 +18,7 @@ function printHelp() {
println " Flags:"
println " Used with \033[0;32mnetwork.sh prereq\033[0m:"
println " -i FabricVersion (default: '2.5.14')"
println " -cai Fabric CA Version (default: '1.5.15')"
println " -cai Fabric CA Version (default: '1.5.17')"
println
elif [ "$USAGE" == "up" ]; then
println "Usage: "
@ -160,7 +160,7 @@ function printHelp() {
println " Flags:"
println " Used with \033[0;32mnetwork.sh prereq\033[0m"
println " -i FabricVersion (default: '2.5.14')"
println " -cai Fabric CA Version (default: '1.5.15')"
println " -cai Fabric CA Version (default: '1.5.17')"
println
println " Used with \033[0;32mnetwork.sh up\033[0m, \033[0;32mnetwork.sh createChannel\033[0m:"
println " -ca - Use Certificate Authorities to generate network crypto material"