Skip to content

Commit

Permalink
Updates in main for Fabric CA release v1.5.5
Browse files Browse the repository at this point in the history
Signed-off-by: Josh Kneubuhl <[email protected]>
  • Loading branch information
jkneubuh authored and ale-linux committed Jul 8, 2022
1 parent 30d68b6 commit 16a8c98
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/source/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Run the script with the `-h` option to see the options:
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.4.4')
-c, --ca-version: Fabric CA Version (default: '1.5.4')
-c, --ca-version: Fabric CA Version (default: '1.5.5')
```

## Choosing which components
Expand Down
6 changes: 3 additions & 3 deletions scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# if version not passed in, default to latest released version
VERSION=2.4.4
# if ca version not passed in, default to latest released version
CA_VERSION=1.5.4
CA_VERSION=1.5.5
ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m |sed 's/x86_64/amd64/g')" |sed 's/darwin-arm64/darwin-amd64/g')
MARCH=$(uname -m)

Expand All @@ -21,8 +21,8 @@ printHelp() {
echo "-s : bypass fabric-samples repo clone"
echo "-b : bypass download of platform-specific binaries"
echo
echo "e.g. bootstrap.sh 2.4.4 1.5.4 -s"
echo "will download docker images and binaries for Fabric v2.4.4 and Fabric CA v1.5.4"
echo "e.g. bootstrap.sh 2.4.4 1.5.5 -s"
echo "will download docker images and binaries for Fabric v2.4.4 and Fabric CA v1.5.5"
}

# dockerPull() pulls docker images from fabric and chaincode repositories
Expand Down
4 changes: 2 additions & 2 deletions scripts/install-fabric.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ _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.4.4"
_arg_ca_version="1.5.4"
_arg_ca_version="1.5.5"

ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m |sed 's/x86_64/amd64/g')" |sed 's/darwin-arm64/darwin-amd64/g')
MARCH=$(uname -m)
Expand Down Expand Up @@ -50,7 +50,7 @@ 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.4.4')"
printf '\t%s\n' "-c, --ca-version: Fabric CA Version (default: '1.5.4')"
printf '\t%s\n' "-c, --ca-version: Fabric CA Version (default: '1.5.5')"
}


Expand Down

0 comments on commit 16a8c98

Please sign in to comment.