[CE-90] Worker peer and orderer restart fix

Fabric peer and orderer nodes restarting problem fix Restructuring of worker node setup script, move docker pull to download.sh script from setup_docker_worker_node.sh Change-Id: I67c822fe5b0a8acb9c6c54de536449f1dbe40581 Signed-off-by: indirajith <[email protected]>
hyperledger-cello · Jul 19, 2017 · 2b224d8 · 2b224d8
1 parent c5b9dcc
commit 2b224d8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 38 deletions.
diff --git a/scripts/worker_node/download_images.sh b/scripts/worker_node/download_images.sh
@@ -12,33 +12,29 @@ else
  alias echo_b="echo"
 fi
 
+# pull fabric images
 ARCH=x86_64
 BASEIMAGE_RELEASE=0.3.1
 BASE_VERSION=1.0.0
 PROJECT_VERSION=1.0.0
+IMG_TAG=1.0.0
 
-IMG_VERSION=1.0.0
-# latest is only For testing latest images
-
-echo_b "Downloading images from DockerHub... need a while"
-
+echo_b "Downloading fabric images from DockerHub...with tag = ${IMG_TAG}... need a while"
 # TODO: we may need some checking on pulling result?
-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
+docker pull hyperledger/fabric-peer:$ARCH-$IMG_TAG
+docker pull hyperledger/fabric-orderer:$ARCH-$IMG_TAG
+docker pull hyperledger/fabric-ca:$ARCH-$IMG_TAG
+docker pull hyperledger/fabric-ccenv:$ARCH-$IMG_TAG
+docker pull hyperledger/fabric-baseimage:$ARCH-$BASEIMAGE_RELEASE
+docker pull hyperledger/fabric-baseos:$ARCH-$BASEIMAGE_RELEASE
 
 # 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 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_b "===Re-tagging images to *latest* tag"
+docker tag hyperledger/fabric-peer:$ARCH-$IMG_TAG hyperledger/fabric-peer
+docker tag hyperledger/fabric-peer:$ARCH-$IMG_TAG hyperledger/fabric-tools
+docker tag hyperledger/fabric-orderer:$ARCH-$IMG_TAG hyperledger/fabric-orderer
+docker tag hyperledger/fabric-ca:$ARCH-$IMG_TAG hyperledger/fabric-ca
 
 echo_g "Done, now worker node should have all images, use `docker images` to check"
diff --git a/scripts/worker_node/setup_docker_worker_node.sh b/scripts/worker_node/setup_docker_worker_node.sh
@@ -19,25 +19,7 @@ else
 fi
 
 # pull fabric images
-ARCH=x86_64
-BASEIMAGE_RELEASE=0.3.1
-BASE_VERSION=1.0.0
-PROJECT_VERSION=1.0.0
-IMG_TAG=1.0.0
-
-echo_b "===Pulling fabric images... with tag = ${IMG_TAG}"
-docker pull hyperledger/fabric-peer:$ARCH-$IMG_TAG
-docker pull hyperledger/fabric-orderer:$ARCH-$IMG_TAG
-docker pull hyperledger/fabric-ca:$ARCH-$IMG_TAG
-docker pull hyperledger/fabric-ccenv:$ARCH-$IMG_TAG
-docker pull hyperledger/fabric-baseimage:$ARCH-$BASEIMAGE_RELEASE
-docker pull hyperledger/fabric-baseos:$ARCH-$BASEIMAGE_RELEASE
-
-echo_b "===Re-tagging images to *latest* tag"
-docker tag hyperledger/fabric-peer:$ARCH-$IMG_TAG hyperledger/fabric-peer
-docker tag hyperledger/fabric-peer:$ARCH-$IMG_TAG hyperledger/fabric-tools
-docker tag hyperledger/fabric-orderer:$ARCH-$IMG_TAG hyperledger/fabric-orderer
-docker tag hyperledger/fabric-ca:$ARCH-$IMG_TAG hyperledger/fabric-ca
+bash ./download_images.sh
 
 echo_b "Copy required fabric 1.0 artifacts"
 ARTIFACTS_DIR=/opt/cello
@@ -46,7 +28,7 @@ echo_b "Checking local artifacts path ${ARTIFACTS_DIR}..."
 [ ! -d ${ARTIFACTS_DIR} ] \
 	&& echo_r "Local artifacts path ${ARTIFACTS_DIR} not existed, creating one" \
 	&& sudo mkdir -p ${ARTIFACTS_DIR} \
-	&& cp -r src/agent/docker/_compose_files/fabric-1.0 ${ARTIFACTS_DIR} \
+	&& sudo cp -r ../../src/agent/docker/_compose_files/fabric-1.0 ${ARTIFACTS_DIR} \
 	&& sudo chown -R ${USER}:${USER} ${ARTIFACTS_DIR}
 
 echo_b "Setup ip forward rules"