From a4bf700a277b4de84b1a59da4f9c51b63a3231bb Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Wed, 11 Dec 2019 16:14:30 -0500 Subject: [PATCH] Update prereq doc for Go 1.13.x Also removed duplicate prereq info in docs. Signed-off-by: David Enyeart --- docs/source/dev-setup/devenv.rst | 5 +---- docs/source/prereqs.rst | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/source/dev-setup/devenv.rst b/docs/source/dev-setup/devenv.rst index 5b06fdf9efd..99335db3cf5 100644 --- a/docs/source/dev-setup/devenv.rst +++ b/docs/source/dev-setup/devenv.rst @@ -4,13 +4,10 @@ Setting up the development environment Prerequisites ~~~~~~~~~~~~~ -- `Git client `__ -- `Go `__ - version 1.12.x +- Git client, Go, and Docker as described at :doc:`../prereqs` - (macOS) `Xcode `__ must be installed -- `Docker `__ - 17.06.2-ce or later -- `Docker Compose `__ - 1.14.0 or later - (macOS) you may need to install gnutar, as macOS comes with bsdtar as the default, but the build uses some gnutar flags. You can use Homebrew to install it as follows: diff --git a/docs/source/prereqs.rst b/docs/source/prereqs.rst index 8fd2bb25556..651a56d38a6 100644 --- a/docs/source/prereqs.rst +++ b/docs/source/prereqs.rst @@ -83,7 +83,7 @@ Go Programming Language Hyperledger Fabric uses the Go Programming Language for many of its components. - - `Go `__ version 1.12.x is required. + - `Go `__ version 1.13.x is required. Given that we will be writing chaincode programs in Go, there are two environment variables you will need to set properly; you can make these