Skip to content

Commit

Permalink
Updates in main docs and scripts for v2.5.10 release (#5077)
Browse files Browse the repository at this point in the history
Catching up the install scripts and docs.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
  • Loading branch information
denyeart authored Dec 17, 2024
1 parent c28e052 commit 0501b0d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions docs/source/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ Run the script with the `-h` option to see the options:
./install-fabric.sh -h
Usage: ./install-fabric.sh [-f|--fabric-version <arg>] [-c|--ca-version <arg>] <comp-1> [<comp-2>] ... [<comp-n>] ...
<comp>: Component to install one or more of d[ocker]|b[inary]|s[amples]. If none specified, all will be installed
-f, --fabric-version: FabricVersion (default: '2.5.9')
-c, --ca-version: Fabric CA Version (default: '1.5.12')
-f, --fabric-version: FabricVersion (default: '2.5.10')
-c, --ca-version: Fabric CA Version (default: '1.5.13')
```

## Choosing which components
Expand All @@ -70,10 +70,10 @@ If no arguments are supplied, then the arguments `docker binary samples` are ass

By default the latest version of the components are used; these can be altered by using the options `--fabric-version` and `-ca-version`. `-f` and `-c` are the respective short forms.

For example, to download the v2.5.9 binaries, run this command
For example, to download the v2.5.10 binaries, run this command

```bash
./install-fabric.sh --fabric-version 2.5.9 binary
./install-fabric.sh --fabric-version 2.5.10 binary
```

You have completed installing Fabric samples, Docker images, and binaries to your system.
Expand Down
8 changes: 4 additions & 4 deletions scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#

# if version not passed in, default to latest released version
VERSION=2.5.9
VERSION=2.5.10
# if ca version not passed in, default to latest released version
CA_VERSION=1.5.12
CA_VERSION=1.5.13

REGISTRY=${FABRIC_DOCKER_REGISTRY:-docker.io/hyperledger}

Expand All @@ -30,8 +30,8 @@ printHelp() {
echo "-s : bypass fabric-samples repo clone"
echo "-b : bypass download of platform-specific binaries"
echo
echo "e.g. bootstrap.sh 2.5.9 1.5.12 -s"
echo "will download docker images and binaries for Fabric v2.5.9 and Fabric CA v1.5.12"
echo "e.g. bootstrap.sh 2.5.10 1.5.13 -s"
echo "will download docker images and binaries for Fabric v2.5.10 and Fabric CA v1.5.13"
}

# dockerPull() pulls docker images from fabric and chaincode repositories
Expand Down
8 changes: 4 additions & 4 deletions scripts/install-fabric.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ _arg_comp=('' )

# if version not passed in, default to latest released version
# if ca version not passed in, default to latest released version
_arg_fabric_version="2.5.9"
_arg_ca_version="1.5.12"
_arg_fabric_version="2.5.10"
_arg_ca_version="1.5.13"

REGISTRY=${FABRIC_DOCKER_REGISTRY:-docker.io/hyperledger}

Expand Down Expand Up @@ -55,8 +55,8 @@ print_help()
{
printf 'Usage: %s [-f|--fabric-version <arg>] [-c|--ca-version <arg>] <comp-1> [<comp-2>] ... [<comp-n>] ...\n' "$0"
printf '\t%s\n' "<comp> Component to install, one or more of docker | binary | samples | podman First letter of component also accepted; If none specified docker | binary | samples is assumed"
printf '\t%s\n' "-f, --fabric-version: FabricVersion (default: '2.5.9')"
printf '\t%s\n' "-c, --ca-version: Fabric CA Version (default: '1.5.12')"
printf '\t%s\n' "-f, --fabric-version: FabricVersion (default: '2.5.10')"
printf '\t%s\n' "-c, --ca-version: Fabric CA Version (default: '1.5.13')"
}


Expand Down

0 comments on commit 0501b0d

Please sign in to comment.