Skip to content

Commit

Permalink
Install doc and script updates for v2.0.0
Browse files Browse the repository at this point in the history
Install doc updates for v2.0.0
Download script updates for v2.0.0
What's New upgrade and release note updates for v2.0.0

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
  • Loading branch information
denyeart committed Jan 29, 2020
1 parent 324d2d1 commit 77ff3d2
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 10 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ open source architecture; Hyperledger Fabric is your starting point.

## Releases

- [v2.0.0 - January 29, 2020](https://github.com/hyperledger/fabric/releases/tag/v2.0.0)
- [v2.0.0-beta - December 12, 2019](https://github.com/hyperledger/fabric/releases/tag/v2.0.0-beta)
- [v2.0.0-alpha - April 9, 2019](https://github.com/hyperledger/fabric/releases/tag/v2.0.0-alpha)
- [v1.4.4 - November 14, 2019](https://github.com/hyperledger/fabric/releases/tag/v1.4.4)
Expand Down Expand Up @@ -64,6 +65,7 @@ Please visit the [Hyperledger Fabric wiki](https://wiki.hyperledger.org/display/
Please visit our
online documentation for
information on getting started using and developing with the fabric, SDK and chaincode:
- [v2.0](http://hyperledger-fabric.readthedocs.io/en/release-2.0/)
- [v1.4](http://hyperledger-fabric.readthedocs.io/en/release-1.4/)
- [v1.3](http://hyperledger-fabric.readthedocs.io/en/release-1.3/)
- [v1.2](http://hyperledger-fabric.readthedocs.io/en/release-1.2/)
Expand Down
9 changes: 7 additions & 2 deletions docs/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ Hyperledger Fabric.
documentation for `shared drives <https://docs.docker.com/docker-for-windows/#shared-drives>`__
and use a location under one of the shared drives.

.. note:: If you are running on **Mac**, you may need to install ``wget`` before proceeding.
The ``wget`` command is used to download binaries from GitHub releases.
To install wget, ``brew install wget``.

Determine a location on your machine where you want to place the `fabric-samples`
repository and enter that directory in a terminal window. The
command that follows will perform the following steps:
Expand All @@ -48,12 +52,13 @@ the binaries and images.
.. note:: If you want a specific release, pass a version identifier for Fabric,
Fabric-ca and thirdparty Docker images.
The command below demonstrates how to download **Fabric v2.0.0 Beta release v2.0.0-beta**
The command below demonstrates how to download the latest production releases -
**Fabric v2.0.0** and **Fabric CA v1.4.4**

.. code:: bash
curl -sSL https://bit.ly/2ysbOFE | bash -s -- <fabric_version> <fabric-ca_version> <thirdparty_version>
curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.0.0-beta 1.4.4 0.4.18
curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.0.0 1.4.4 0.4.18
.. note:: If you get an error running the above curl command, you may
have too old a version of curl that does not handle
Expand Down
10 changes: 9 additions & 1 deletion docs/source/prereqs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ documentation.
.. note:: If you're on Windows please see the specific note on `Windows
extras`_ below.

Install wget
------------

If you will be downloading Fabric binaries based on the :doc:`install` documentation,
you will need ``wget`` installed.

- MacOSX does not include ``wget`` by default, you can install it using ``brew install wget``.

Docker and Docker Compose
-------------------------

Expand Down Expand Up @@ -183,7 +191,7 @@ Alternatively, you can change the Docker Quickstart Terminal command
to use MSYS2 bash by changing the target of the Windows shortcut from:

::

"C:\Program Files\Git\bin\bash.exe" --login -i "C:\Program Files\Docker Toolbox\start.sh"

to:
Expand Down
8 changes: 4 additions & 4 deletions docs/source/whatsnew.rst
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ For more information about this network, check out :doc:`test_network`.
Upgrading to Fabric v2.0
------------------------

While a Beta release is not an intended upgrade target for existing Fabric
deployments, there is nothing preventing you from testing an upgrade scenario
to get familiar with the process.
A major new release brings some additional upgrade considerations. Rest assured
though, that rolling upgrades from v1.4.x to v2.0 are supported, so that network
components can be upgraded one at a time with no downtime.

The upgrade docs have been significantly expanded and reworked, and now have a
standalone home in the documentation: :doc:`upgrade`. Here you'll find documentation on
Expand All @@ -213,7 +213,7 @@ The release notes provide more details for users moving to the new release.
Specifically, take a look at the changes and deprecations that are being
announced with the new Fabric v2.0 release.

* `Fabric v2.0.0-beta release notes <https://github.com/hyperledger/fabric/releases/tag/v2.0.0-beta>`_.
* `Fabric v2.0.0 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.0.0>`_.

.. Licensed under Creative Commons Attribution 4.0 International License
https://creativecommons.org/licenses/by/4.0/
6 changes: 3 additions & 3 deletions scripts/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#

# if version not passed in, default to latest released version
VERSION=1.4.4
VERSION=2.0.0
# if ca version not passed in, default to latest released version
CA_VERSION=1.4.4
# current version of thirdparty images (couchdb, kafka and zookeeper) released
Expand All @@ -23,8 +23,8 @@ printHelp() {
echo "-s : bypass fabric-samples repo clone"
echo "-b : bypass download of platform-specific binaries"
echo
echo "e.g. bootstrap.sh 1.4.4 -s"
echo "would download docker images and binaries for version 1.4.4"
echo "e.g. bootstrap.sh 2.0.0 1.4.4 0.4.18 -s"
echo "would download docker images and binaries for Fabric v2.0.0 and Fabric CA v1.4.4"
}

# dockerPull() pulls docker images from fabric and chaincode repositories
Expand Down

0 comments on commit 77ff3d2

Please sign in to comment.