From 2a2e4b13bc2e885b18580ece6f781c116d13a946 Mon Sep 17 00:00:00 2001
From: Baohua Yang <yangbaohua@gmail.com>
Date: Thu, 1 Jun 2017 11:15:41 +0800
Subject: [PATCH] Update instructions

---
 hyperledger/1.0/README.md                  | 8 +++++---
 hyperledger/1.0/docker-compose-dev.yml     | 2 --
 hyperledger/1.0/scripts/download_images.sh | 2 +-
 hyperledger/1.0/scripts/start_fabric.sh    | 8 ++------
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/hyperledger/1.0/README.md b/hyperledger/1.0/README.md
index a867fa1e..ad95db22 100644
--- a/hyperledger/1.0/README.md
+++ b/hyperledger/1.0/README.md
@@ -11,10 +11,12 @@ If you're not familiar with Docker and Blockchain, can have a look at 2 books (i
 
 tldr :)
 
-With Ubuntu/Debian, you can simple use the following script to setup the environment in one instruction.
+With Ubuntu/Debian, you can simple use the following scripts to setup the environment and start the fabric network.
 
 ```sh
-$ bash setup_fabric_1.0.sh
+$ bash scripts/setup_Docker.sh  # Install Docker, Docker-Compose 
+  bash scripts/download_images.sh  # Pull required Docker images
+  bash scripts/start_fabric.sh
 ```
 
 If you want to setup the environment manually, then can follow the below steps in this section.
@@ -24,7 +26,7 @@ If you want to setup the environment manually, then can follow the below steps i
 Pull necessary images of peer, orderer, ca, and base image.
 
 ```sh
-$ bash scripts/start_fabric.sh
+$ bash scripts/download_images.sh
 ```
 
 There are also some community [images](https://hub.docker.com/r/hyperledger/) at Dockerhub, use at your own choice.
diff --git a/hyperledger/1.0/docker-compose-dev.yml b/hyperledger/1.0/docker-compose-dev.yml
index b0cfb51c..780dcb06 100644
--- a/hyperledger/1.0/docker-compose-dev.yml
+++ b/hyperledger/1.0/docker-compose-dev.yml
@@ -45,7 +45,6 @@ services:
     environment:
       - CORE_PEER_ID=peer0
       - CORE_PEER_GOSSIP_ORGLEADER=true
-     # - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
     links:
       - orderer0
     ports:
@@ -64,7 +63,6 @@ services:
       - CORE_PEER_ID=cli
       - CORE_PEER_ADDRESS=peer0:7051
       #- CORE_PEER_LOCALMSPID=Org0MSP
-      #- CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer:7050
     links:
       - peer0
       - orderer0
diff --git a/hyperledger/1.0/scripts/download_images.sh b/hyperledger/1.0/scripts/download_images.sh
index 99833ac9..23af498f 100644
--- a/hyperledger/1.0/scripts/download_images.sh
+++ b/hyperledger/1.0/scripts/download_images.sh
@@ -5,7 +5,7 @@ source ./header.sh
 ARCH=x86_64
 BASE_VERSION=1.0.0-preview
 PROJECT_VERSION=1.0.0-preview
-IMG_VERSION=0.9.3
+IMG_VERSION=0.9.4
 
 echo_b "Downloading images from DockerHub..."
 
diff --git a/hyperledger/1.0/scripts/start_fabric.sh b/hyperledger/1.0/scripts/start_fabric.sh
index 7dd1beb2..309098cf 100644
--- a/hyperledger/1.0/scripts/start_fabric.sh
+++ b/hyperledger/1.0/scripts/start_fabric.sh
@@ -1,12 +1,8 @@
 #!/usr/bin/env bash
 
-source ./header.sh
+source ./scripts/header.sh
 
-COMPOSE_FILE=${1:-"docker-compose.yml"}
-
-bash ./setup_Docker.sh
-
-bash ./download_images.sh
+COMPOSE_FILE=${1:-"docker-compose-2orgs.yml"}
 
 echo_b "Start up with ${COMPOSE_FILE}"