From 9894153230f5cfbeea68231cb1550d09db7c2ed4 Mon Sep 17 00:00:00 2001 From: rameshthoomu Date: Sun, 18 Feb 2018 08:29:54 -0500 Subject: [PATCH] FAB-8363 update baseimage version to 0.4.6 This patch will update the baseimage version to 0.4.6. - It supports the below changes: -------------------------------------------------- FAB-8264 upgrade nodejs version to v8.9.4 [FAB-7884] direct couchdb logs to stderr [FAB-7707] Disable time-based kafka log retention. [FAB-7868] Upgrade Kafka to version 1.0.0 --------------------------------------------------- - update kafka version to 1.0.0 in upgrade document - delete .baseimage-release file and move the BASEIMAGE_RELEASE to Makefile Change-Id: I36e5c7ef48e87f0484019b9b720f2e69ae867591 Signed-off-by: rameshthoomu --- .baseimage-release | 1 - Makefile | 5 +++-- docs/source/upgrade_to_one_point_one.rst | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 .baseimage-release diff --git a/.baseimage-release b/.baseimage-release deleted file mode 100644 index 0bfccb08040..00000000000 --- a/.baseimage-release +++ /dev/null @@ -1 +0,0 @@ -0.4.5 diff --git a/Makefile b/Makefile index ea3e7ecbf32..bf4a2315cb9 100755 --- a/Makefile +++ b/Makefile @@ -42,6 +42,9 @@ BASE_VERSION = 1.1.0-beta PREV_VERSION = 1.1.0-alpha +CHAINTOOL_RELEASE=1.0.1 +BASEIMAGE_RELEASE=0.4.6 + # Allow to build as a submodule setting the main project to # the PROJECT_NAME env variable, for example, # export PROJECT_NAME=hyperledger/fabric-test @@ -68,8 +71,6 @@ PKGNAME = github.com/$(PROJECT_NAME) CGO_FLAGS = CGO_CFLAGS=" " ARCH=$(shell uname -m) MARCH=$(shell go env GOOS)-$(shell go env GOARCH) -CHAINTOOL_RELEASE=1.0.1 -BASEIMAGE_RELEASE=$(shell cat ./.baseimage-release) # defined in common/metadata/metadata.go METADATA_VAR = Version=$(PROJECT_VERSION) diff --git a/docs/source/upgrade_to_one_point_one.rst b/docs/source/upgrade_to_one_point_one.rst index 5918dab28fa..b9c17c64e15 100644 --- a/docs/source/upgrade_to_one_point_one.rst +++ b/docs/source/upgrade_to_one_point_one.rst @@ -427,7 +427,7 @@ version. The Kafka protocol version is set using either the ``Kafka.Version`` ke ``orderer.yaml`` file or via the ``ORDERER_KAFKA_VERSION`` environment variable in a Docker deployment. Hyperledger Fabric v1.0 provided sample Kafka docker images containing Kafka version ``0.9.0.1``. Hyperledger Fabric v1.1 provides sample Kafka docker images containing -Kafka version ``0.10.2.1``. +Kafka version ``1.0.0``. Upgrading CouchDB -----------------