Skip to content

Commit

Permalink
FAB-8363 update baseimage version to 0.4.6
Browse files Browse the repository at this point in the history
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 <rameshbabu.thoomu@gmail.com>
  • Loading branch information
rameshthoomu committed Feb 19, 2018
1 parent 5dcaee8 commit 9894153
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 0 additions & 1 deletion .baseimage-release

This file was deleted.

5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/source/upgrade_to_one_point_one.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----------------
Expand Down

0 comments on commit 9894153

Please sign in to comment.