From 2e4c23938ba3cab6d2425a5aa53091b5bb6836a0 Mon Sep 17 00:00:00 2001 From: Luis Sanchez Date: Tue, 13 Dec 2016 12:51:03 -0500 Subject: [PATCH] [FAB-1370] Add orderer and peer binaries to testenv Change-Id: I0b940003c4c686aaa0dfef3406b8427bc7cf0022 Signed-off-by: Luis Sanchez --- Makefile | 7 +++++- .../orderer-n-kafka-n/orderer/Dockerfile | 15 ++++++++++--- images/testenv/Dockerfile.in | 22 +++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 90287454129..08fc13b6405 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,12 @@ build/image/peer/payload: build/docker/bin/peer \ build/genesis-sampleconfig.tar.bz2 build/image/orderer/payload: build/docker/bin/orderer \ orderer/orderer.yaml -build/image/testenv/payload: build/gotools.tar.bz2 +build/image/testenv/payload: build/gotools.tar.bz2 \ + build/docker/bin/orderer \ + orderer/orderer.yaml \ + build/docker/bin/peer \ + peer/core.yaml \ + build/msp-sampleconfig.tar.bz2 build/image/runtime/payload: build/docker/busybox build/image/%/payload: diff --git a/bddtests/environments/orderer-n-kafka-n/orderer/Dockerfile b/bddtests/environments/orderer-n-kafka-n/orderer/Dockerfile index 6d4c3fe0838..097e09f741c 100644 --- a/bddtests/environments/orderer-n-kafka-n/orderer/Dockerfile +++ b/bddtests/environments/orderer-n-kafka-n/orderer/Dockerfile @@ -1,8 +1,17 @@ -FROM hyperledger/fabric-orderer +FROM hyperledger/fabric-testenv WORKDIR /opt/gopath/src/github.com/hyperledger/fabric/orderer -RUN apt-get update \ - && apt-get install -y zookeeper jq \ +RUN DEBIAN_FRONTEND=noninteractive apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y zookeeper jq \ && rm -rf /var/lib/apt/lists/* +ENV ORDERER_GENERAL_LEDGERTYPE=ram \ + ORDERER_GENERAL_BATCHTIMEOUT=10s \ + ORDERER_GENERAL_BATCHSIZE=10 \ + ORDERER_GENERAL_MAXWINDOWSIZE=1000 \ + ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 \ + ORDERER_GENERAL_LISTENPORT=7050 \ + ORDERER_RAMLEDGER_HISTORY_SIZE=100 \ + ORDERER_GENERAL_GENESISMETHOD=provisional +ENV ORDERER_GENERAL_ORDERERTYPE=kafka ADD docker-entrypoint.sh /docker-entrypoint.sh ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["orderer"] diff --git a/images/testenv/Dockerfile.in b/images/testenv/Dockerfile.in index 425a946620d..d691119f725 100644 --- a/images/testenv/Dockerfile.in +++ b/images/testenv/Dockerfile.in @@ -1,3 +1,25 @@ FROM hyperledger/fabric-baseimage:_BASE_TAG_ + +# fabric configuration file locations +RUN mkdir -p /etc/hyperledger/fabric +ENV ORDERER_CFG_PATH /etc/hyperledger/fabric +ENV PEER_CFG_PATH /etc/hyperledger/fabric + +# ledger db location +RUN mkdir -p /var/hyperledger/db + +# install gotools ADD payload/gotools.tar.bz2 /usr/local/bin/ + +# fabric configuration files +COPY payload/orderer.yaml $ORDERER_CFG_PATH +COPY payload/core.yaml $PEER_CFG_PATH +ADD payload/msp-sampleconfig.tar.bz2 $PEER_CFG_PATH + + +# fabric binaries +COPY payload/orderer /usr/local/bin +COPY payload/peer /usr/local/bin + +# typically, this is mapped to a developer's dev environment WORKDIR /opt/gopath/src/github.com/hyperledger/fabric