Initial fix for FAB-1413.

Use platform specific testenv image as base image for orderer kafka
behave tests instead of using x86_64 specific openjre image. This ensures
'make behave' works on all platforms (x86_64, ppc64le and s390x).

Change-Id: Ib12a3e1162b0bbec19f7c17cd35b2a91dc9afa74
Signed-off-by: Krishna Harsha Voora <[email protected]>

Author: Krishna Harsha Voora

Makefile

@@ -108,6 +108,9 @@ BEHAVE_ENVIRONMENTS = kafka orderer-1-kafka-1 orderer-1-kafka-3
 .PHONY: behave-environments $(BEHAVE_ENVIRONMENTS)
 behave-environments: $(BEHAVE_ENVIRONMENTS)
 $(BEHAVE_ENVIRONMENTS):
+	@echo "# Generated from Dockerfile.in.  DO NOT EDIT!" > bddtests/environments/kafka/Dockerfile
+	@cat bddtests/environments/kafka/Dockerfile.in | \
+	sed -e "s|_DOCKER_TAG_|$(DOCKER_TAG)|" >> bddtests/environments/kafka/Dockerfile
 	@docker-compose --file bddtests/environments/$@/docker-compose.yml build
 
 behave-deps: docker peer build/bin/block-listener behave-environments

bddtests/environments/kafka/Dockerfile bddtests/environments/kafka/Dockerfile.in

@@ -1,4 +1,4 @@
-FROM openjdk:8u111-jre
+FROM hyperledger/fabric-testenv:_DOCKER_TAG_
 
 ENV SCALA_VERSION=2.11 \
     KAFKA_VERSION=0.9.0.1 \