From b564c9b58c6b3da2e031f51ceee08004aca6628c Mon Sep 17 00:00:00 2001
From: indirajith <indirajithv@gmail.com>
Date: Thu, 13 Jul 2017 10:54:44 +0200
Subject: [PATCH] [CE-83] Modify workernode fabric image tags to 1.0.0

This update enables fabric v1.0.0 on worker nodes.
The image tags are modified to 1.0.0 from v1.0.0-rc1.
Image sources are changed to hyperledger official images
from yeasy/.

Change-Id: I8b6c9d9f30e617bd8ff6c06e9e82a7e8d58f3a53
Signed-off-by: indirajith <indirajithv@gmail.com>
---
 .env                                   |  2 +-
 scripts/worker_node/download_images.sh | 27 +++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.env b/.env
index 7b748745..6883f609 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 STATIC_FOLDER=themes/basic/static
 TEMPLATE_FOLDER=themes/basic/templates
-NPM_REGISTRY=
\ No newline at end of file
+NPM_REGISTRY=registry.npmjs.org
\ No newline at end of file
diff --git a/scripts/worker_node/download_images.sh b/scripts/worker_node/download_images.sh
index aa0fef16..1bb49df6 100644
--- a/scripts/worker_node/download_images.sh
+++ b/scripts/worker_node/download_images.sh
@@ -15,29 +15,30 @@ fi
 ARCH=x86_64
 BASEIMAGE_RELEASE=0.3.1
 BASE_VERSION=1.0.0
-PROJECT_VERSION=1.0.0-rc1
+PROJECT_VERSION=1.0.0
 
-IMG_VERSION=v1.0.0-rc1
+IMG_VERSION=1.0.0
 # latest is only For testing latest images
 
 echo_b "Downloading images from DockerHub... need a while"
 
 # TODO: we may need some checking on pulling result?
-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 hyperledger/fabric-baseimage:$ARCH-$BASEIMAGE_RELEASE \
+ && docker pull hyperledger/fabric-baseos:$ARCH-$BASEIMAGE_RELEASE \
+ && docker pull hyperledger/fabric-peer:$ARCH-$IMG_VERSION \
+ && docker pull hyperledger/fabric-orderer:$ARCH-$IMG_VERSION \
+ && docker pull hyperledger/fabric-ca:$ARCH-$IMG_VERSION
 
 # Only useful for debugging
 # docker pull yeasy/hyperledger-fabric
 
 echo_b "Rename images with official tags ... fabric-peer, fabric-orderer, fabric-tools, fabric-ca, fabric-ccenv, fabric-bareos, fabric-baseimage"
-docker tag yeasy/hyperledger-fabric-peer:$IMG_VERSION hyperledger/fabric-peer \
-  && docker tag yeasy/hyperledger-fabric-peer:$IMG_VERSION hyperledger/fabric-tools \
-  && 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-ccenv:$ARCH-$PROJECT_VERSION \
-  && docker tag yeasy/hyperledger-fabric-base:$IMG_VERSION hyperledger/fabric-baseos:$ARCH-$BASE_VERSION \
-  && docker tag yeasy/hyperledger-fabric-base:$IMG_VERSION hyperledger/fabric-baseimage:$ARCH-$BASEIMAGE_RELEASE
+docker tag hyperledger/fabric-peer:$ARCH-$IMG_VERSION hyperledger/fabric-peer \
+  && docker tag hyperledger/fabric-peer:$ARCH-$IMG_VERSION hyperledger/fabric-tools \
+  && docker tag hyperledger/fabric-orderer:$ARCH-$IMG_VERSION hyperledger/fabric-orderer \
+  && docker tag hyperledger/fabric-ca:$ARCH-$IMG_VERSION hyperledger/fabric-ca \
+  && docker tag hyperledger/fabric-baseos:$ARCH-$BASEIMAGE_RELEASE hyperledger/fabric-ccenv:$ARCH-$PROJECT_VERSION \
+  && docker tag hyperledger/fabric-baseos:$ARCH-$BASEIMAGE_RELEASE hyperledger/fabric-baseos:$ARCH-$BASEIMAGE_RELEASE \
+  && docker tag hyperledger/fabric-baseimage:$ARCH-$BASEIMAGE_RELEASE hyperledger/fabric-baseimage:$ARCH-$BASEIMAGE_RELEASE
 
 echo_g "Done, now worker node should have all images, use `docker images` to check"