mass restucturing

Author: joequant

Dockerfile

@@ -8,18 +8,34 @@ MAINTAINER Baohua Yang
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update \
-        && apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev \
+        && apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev software-properties-common curl wget unzip autoconf build-essential libtool nodejs \
         && rm -rf /var/cache/apt
 
+# install nodejs
+#RUN cd /tmp \
+#&& wget --quiet https://nodejs.org/dist/node-v0.12.7/node-v0.12.7-linux-x64.tar.gz \
+#&& cd /usr/local \
+#&& tar --strip-components 1 -xzf /tmp/node-v0.12.7/node-v0.12.7-linux-x64.tar.gz
+
+# install protoc
+RUN cd /tmp \
+        && git clone --single-branch https://github.com/google/protobuf.git \
+        && cd protobuf \
+        && git checkout 12fb61b292d7ec4cb14b0d60e58ed5c35adda3b7 \
+        && ./autogen.sh \
+        && ./configure --prefix=/usr \
+        && make \
+        && make check \
+        && make install \
+        && export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
+
 # install rocksdb
 RUN cd /tmp \
  && git clone --single-branch -b v4.1 --depth 1 https://github.com/facebook/rocksdb.git \
  && cd rocksdb \
  && PORTABLE=1 make shared_lib \
  && INSTALL_PATH=/usr/local make install-shared \
- && ldconfig \
- && cd / \
- && rm -rf /tmp/rocksdb
+ && ldconfig
 
 RUN mkdir -p /var/hyperledger/db \
         && mkdir -p /var/hyperledger/production
@@ -36,5 +52,9 @@ RUN mkdir -p $GOPATH/src/github.com/hyperledger \
 RUN cp $GOPATH/src/github.com/hyperledger/fabric/core.yaml $GOPATH/bin \
         && cp $GOPATH/src/github.com/hyperledger/fabric/consensus/obcpbft/config.yaml $GOPATH/bin
 
+RUN export GOROOT=/go
+
 # this is only a workaround for current hard-coded problem.
-RUN ln -s $GOPATH /opt/gopath
+RUN ln -s $GOPATH /opt/gopath
+
+WORKDIR "$GOPATH/src/github.com/hyperledger/fabric"

README.md

@@ -2,6 +2,17 @@ Docker-Hyperledger
 ===
 Base Docker images for [Hyperledger](https://www.hyperledger.org).
 
+Quick Start
+===
+Set up scripts for docker version of hyperledger
+
+fabric-setup.sh
+./startnet.sh
+./fabric-run.sh fabric-scripts/deploy.sh
+./fabric-run.sh fabric-scripts/run-test.sh
+
+
+
 # Supported tags and respective Dockerfile links
 
 * [`0.1, latest` (latest/Dockerfile)](https://github.com/yeasy/docker-hyperledger/blob/master/Dockerfile)
@@ -10,29 +21,11 @@ Base Docker images for [Hyperledger](https://www.hyperledger.org).
 For more information about this image and its history, please see the relevant manifest file in the [`yeasy/docker-hyperledger` GitHub repo](https://github.com/yeasy/docker-hyperledger).
 
 # What is docker-hyperledger?
-Base Docker image with hyperledger deployed. Your can see [hyperledger-peer](https://hub.docker.com/r/yeasy/hyperledger-peer/) if you want to deploy a hyperledger cluster.
+Base Docker image with hyperledger deployed. 
 
 # How to use this image?
 The docker image is auto built at [https://registry.hub.docker.com/u/yeasy/hyperledger/](https://registry.hub.docker.com/u/yeasy/hyperledger/).
 
-## In Dockerfile
-```sh
-FROM yeasy/hyperledger:latest
-```
-
-## Local Run
-The image is only for the base environment. So please refer to [hyperledger-peer](https://hub.docker.com/r/yeasy/hyperledger-peer/) if you want a local run.
-
-# Which image is based on?
-The image is built based on [golang:1.6](https://hub.docker.com/_/golang) image.
-
-# What has been changed?
-## install dependencies
-Install required  libsnappy-dev, zlib1g-dev, libbz2-dev.
-
-## install rocksdb
-Install required  rocksdb 4.1.
-
 ## install hyperledger
 Install hyperledger and build the fabric as peer