From 4b0d8ff15dada5a8c75f3a0858178be8679294e7 Mon Sep 17 00:00:00 2001 From: qiang0723 Date: Mon, 20 Feb 2017 13:12:36 +0800 Subject: [PATCH 1/2] modify the images tag to 0.8.3 --- hyperledger/1.0/README.md | 20 ++++++++++---------- hyperledger/1.0/setup_fabric_1.0.sh | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hyperledger/1.0/README.md b/hyperledger/1.0/README.md index 9317d482..ca602550 100644 --- a/hyperledger/1.0/README.md +++ b/hyperledger/1.0/README.md @@ -25,17 +25,17 @@ Pull necessary images of peer, orderer, ca, and base image. $ ARCH=x86_64 $ BASE_VERSION=1.0.0-preview $ PROJECT_VERSION=1.0.0-preview -$ docker pull yeasy/hyperledger-fabric-base:0.8.2 \ - && docker pull yeasy/hyperledger-fabric-peer:0.8.2 \ - && docker pull yeasy/hyperledger-fabric-orderer:0.8.2 \ - && docker pull yeasy/hyperledger-fabric-ca:0.8.2 \ +$ docker pull yeasy/hyperledger-fabric-base:0.8.3 \ + && docker pull yeasy/hyperledger-fabric-peer:0.8.3 \ + && docker pull yeasy/hyperledger-fabric-orderer:0.8.3 \ + && docker pull yeasy/hyperledger-fabric-ca:0.8.3 \ && docker pull yeasy/blockchain-explorer:latest \ - && docker tag yeasy/hyperledger-fabric-peer:0.8.2 hyperledger/fabric-peer \ - && docker tag yeasy/hyperledger-fabric-orderer:0.8.2 hyperledger/fabric-orderer \ - && docker tag yeasy/hyperledger-fabric-ca:0.8.2 hyperledger/fabric-ca \ - && docker tag yeasy/hyperledger-fabric-base:0.8.2 hyperledger/fabric-baseimage \ - && docker tag yeasy/hyperledger-fabric-base:0.8.2 hyperledger/fabric-ccenv:$ARCH-$BASE_VERSION \ - && docker tag yeasy/hyperledger-fabric-base:0.8.2 hyperledger/fabric-bareos:$ARCH-$BASE_VERSION + && docker tag yeasy/hyperledger-fabric-peer:0.8.3 hyperledger/fabric-peer \ + && docker tag yeasy/hyperledger-fabric-orderer:0.8.3 hyperledger/fabric-orderer \ + && docker tag yeasy/hyperledger-fabric-ca:0.8.3 hyperledger/fabric-ca \ + && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-baseimage \ + && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-ccenv:$ARCH-$BASE_VERSION \ + && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-baseos:$ARCH-$BASE_VERSION ``` 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/setup_fabric_1.0.sh b/hyperledger/1.0/setup_fabric_1.0.sh index 73cbe708..6b39b563 100644 --- a/hyperledger/1.0/setup_fabric_1.0.sh +++ b/hyperledger/1.0/setup_fabric_1.0.sh @@ -22,16 +22,16 @@ docker-compose --version ARCH=x86_64 BASE_VERSION=1.0.0-preview PROJECT_VERSION=1.0.0-preview -docker pull yeasy/hyperledger-fabric-base:0.8.2 \ - && docker pull yeasy/hyperledger-fabric-peer:0.8.2 \ - && docker pull yeasy/hyperledger-fabric-orderer:0.8.2 \ - && docker pull yeasy/hyperledger-fabric-ca:0.8.2 \ +docker pull yeasy/hyperledger-fabric-base:0.8.3 \ + && docker pull yeasy/hyperledger-fabric-peer:0.8.3 \ + && docker pull yeasy/hyperledger-fabric-orderer:0.8.3 \ + && docker pull yeasy/hyperledger-fabric-ca:0.8.3 \ && docker pull yeasy/blockchain-explorer:latest \ - && docker tag yeasy/hyperledger-fabric-peer:0.8.2 hyperledger/fabric-peer \ - && docker tag yeasy/hyperledger-fabric-orderer:0.8.2 hyperledger/fabric-orderer \ - && docker tag yeasy/hyperledger-fabric-ca:0.8.2 hyperledger/fabric-ca \ - && docker tag yeasy/hyperledger-fabric-base:0.8.2 hyperledger/fabric-baseimage \ - && docker tag yeasy/hyperledger-fabric-base:0.8.2 hyperledger/fabric-ccenv:$ARCH-$BASE_VERSION \ - && docker tag yeasy/hyperledger-fabric-base:0.8.2 hyperledger/fabric-bareos:$ARCH-$BASE_VERSION + && docker tag yeasy/hyperledger-fabric-peer:0.8.3 hyperledger/fabric-peer \ + && docker tag yeasy/hyperledger-fabric-orderer:0.8.3 hyperledger/fabric-orderer \ + && docker tag yeasy/hyperledger-fabric-ca:0.8.3 hyperledger/fabric-ca \ + && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-baseimage \ + && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-ccenv:$ARCH-$BASE_VERSION \ + && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-baseos:$ARCH-$BASE_VERSION docker-compose up From c1a844305b001a983c26d81036a9c20921058106 Mon Sep 17 00:00:00 2001 From: qiang0723 Date: Tue, 21 Feb 2017 10:44:41 +0800 Subject: [PATCH 2/2] update README.md --- hyperledger/1.0/README.md | 21 +++++++++++---------- hyperledger/1.0/setup_fabric_1.0.sh | 28 ++++++++++++++-------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/hyperledger/1.0/README.md b/hyperledger/1.0/README.md index ca602550..d11663a1 100644 --- a/hyperledger/1.0/README.md +++ b/hyperledger/1.0/README.md @@ -25,17 +25,18 @@ Pull necessary images of peer, orderer, ca, and base image. $ ARCH=x86_64 $ BASE_VERSION=1.0.0-preview $ PROJECT_VERSION=1.0.0-preview -$ docker pull yeasy/hyperledger-fabric-base:0.8.3 \ - && docker pull yeasy/hyperledger-fabric-peer:0.8.3 \ - && docker pull yeasy/hyperledger-fabric-orderer:0.8.3 \ - && docker pull yeasy/hyperledger-fabric-ca:0.8.3 \ +$ IMG_VERSION=0.8.3 +$ docker pull yeasy/hyperledger-fabric-base:$IMG_VERSION \ + && docker pull yeasy/hyperledger-fabric-peer:$IMG_VERSION \ + && docker pull yeasy/hyperledger-fabric-orderer:$IMG_VERSION \ + && docker pull yeasy/hyperledger-fabric-ca:$IMG_VERSION \ && docker pull yeasy/blockchain-explorer:latest \ - && docker tag yeasy/hyperledger-fabric-peer:0.8.3 hyperledger/fabric-peer \ - && docker tag yeasy/hyperledger-fabric-orderer:0.8.3 hyperledger/fabric-orderer \ - && docker tag yeasy/hyperledger-fabric-ca:0.8.3 hyperledger/fabric-ca \ - && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-baseimage \ - && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-ccenv:$ARCH-$BASE_VERSION \ - && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-baseos:$ARCH-$BASE_VERSION + && docker tag yeasy/hyperledger-fabric-peer:$IMG_VERSION hyperledger/fabric-peer \ + && docker tag yeasy/hyperledger-fabric-orderer:$IMG_VERSION hyperledger/fabric-orderer \ + && docker tag yeasy/hyperledger-fabric-ca:$IMG_VERSION hyperledger/fabric-ca \ + && docker tag yeasy/hyperledger-fabric-base:$IMG_VERSION hyperledger/fabric-baseimage \ + && docker tag yeasy/hyperledger-fabric-base:$IMG_VERSION hyperledger/fabric-ccenv:$ARCH-$BASE_VERSION \ + && docker tag yeasy/hyperledger-fabric-base:$IMG_VERSION hyperledger/fabric-baseos:$ARCH-$BASE_VERSION ``` 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/setup_fabric_1.0.sh b/hyperledger/1.0/setup_fabric_1.0.sh index 6b39b563..a4c27bb5 100644 --- a/hyperledger/1.0/setup_fabric_1.0.sh +++ b/hyperledger/1.0/setup_fabric_1.0.sh @@ -19,19 +19,19 @@ curl -L https://github.com/docker/compose/releases/download/1.8.0/docker-compose chmod +x /usr/local/bin/docker-compose docker-compose --version -ARCH=x86_64 -BASE_VERSION=1.0.0-preview -PROJECT_VERSION=1.0.0-preview -docker pull yeasy/hyperledger-fabric-base:0.8.3 \ - && docker pull yeasy/hyperledger-fabric-peer:0.8.3 \ - && docker pull yeasy/hyperledger-fabric-orderer:0.8.3 \ - && docker pull yeasy/hyperledger-fabric-ca:0.8.3 \ +$ ARCH=x86_64 +$ BASE_VERSION=1.0.0-preview +$ PROJECT_VERSION=1.0.0-preview +$ IMG_VERSION=0.8.3 +$ docker pull yeasy/hyperledger-fabric-base:$IMG_VERSION \ + && docker pull yeasy/hyperledger-fabric-peer:$IMG_VERSION \ + && docker pull yeasy/hyperledger-fabric-orderer:$IMG_VERSION \ + && docker pull yeasy/hyperledger-fabric-ca:$IMG_VERSION \ && docker pull yeasy/blockchain-explorer:latest \ - && docker tag yeasy/hyperledger-fabric-peer:0.8.3 hyperledger/fabric-peer \ - && docker tag yeasy/hyperledger-fabric-orderer:0.8.3 hyperledger/fabric-orderer \ - && docker tag yeasy/hyperledger-fabric-ca:0.8.3 hyperledger/fabric-ca \ - && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-baseimage \ - && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-ccenv:$ARCH-$BASE_VERSION \ - && docker tag yeasy/hyperledger-fabric-base:0.8.3 hyperledger/fabric-baseos:$ARCH-$BASE_VERSION - + && docker tag yeasy/hyperledger-fabric-peer:$IMG_VERSION hyperledger/fabric-peer \ + && docker tag yeasy/hyperledger-fabric-orderer:$IMG_VERSION hyperledger/fabric-orderer \ + && docker tag yeasy/hyperledger-fabric-ca:$IMG_VERSION hyperledger/fabric-ca \ + && docker tag yeasy/hyperledger-fabric-base:$IMG_VERSION hyperledger/fabric-baseimage \ + && docker tag yeasy/hyperledger-fabric-base:$IMG_VERSION hyperledger/fabric-ccenv:$ARCH-$BASE_VERSION \ + && docker tag yeasy/hyperledger-fabric-base:$IMG_VERSION hyperledger/fabric-baseos:$ARCH-$BASE_VERSION docker-compose up