Update is running (#123)

updated to check if a chaincode container is running

closes #121

Signed-off-by: Caroline Fletcher <caroline.fletcher@uk.ibm.com>

generators/network/templates/is_running.cmd

@@ -4,14 +4,26 @@ rem Copyright IBM Corp All Rights Reserved
 rem
 rem SPDX-License-Identifier: Apache-2.0
 rem
+
 setlocal enabledelayedexpansion
-for %%c in (<%= dockerName %>_orderer.example.com <%= dockerName %>_ca.org1.example.com <%= dockerName %>_peer0.org1.example.com <%= dockerName %>_couchdb <%= dockerName %>_logspout) do (
-  for /f "usebackq delims=" %%i in (`docker inspect -f {{.State.Running}} %%c 2^>:NUL`) do set running=%%i
+
+if not [%1] == [] (
+  for /f "usebackq delims=" %%i in (`docker inspect -f {{.State.Running}} <%= dockerName %>-peer0.org1.example.com-%1-%2 2^>:NUL`) do set running=%%i
   if not !errorlevel! == 0 (
     exit /b 1
   )
   if not "!running!" == "true" (
     exit /b 1
   )
+) else (
+  for %%c in (<%= dockerName %>_orderer.example.com <%= dockerName %>_ca.org1.example.com <%= dockerName %>_peer0.org1.example.com <%= dockerName %>_couchdb <%= dockerName %>_logspout) do (
+    for /f "usebackq delims=" %%i in (`docker inspect -f {{.State.Running}} %%c 2^>:NUL`) do set running=%%i
+    if not !errorlevel! == 0 (
+      exit /b 1
+    )
+    if not "!running!" == "true" (
+      exit /b 1
+    )
+  )
 )
-exit /b 0
+exit /b 0

generators/network/templates/is_running.sh

@@ -6,12 +6,21 @@
 #
 # Exit on first error, print all commands.
 set +ev
-for container in <%= dockerName %>_orderer.example.com <%= dockerName %>_ca.org1.example.com <%= dockerName %>_peer0.org1.example.com <%= dockerName %>_couchdb <%= dockerName %>_logspout; do
-  running=$(docker inspect -f '{{.State.Running}}' $container 2>/dev/null)
-  if [ "$?" != "0" ]; then 
+
+isRunning() {
+  running=$(docker inspect -f '{{.State.Running}}' $1 2>/dev/null)
+  if [ "$?" != "0" ]; then
     exit 1
-  elif [ "${running}" != "true" ]; then 
+  elif [ "${running}" != "true" ]; then
     exit 1
   fi
-done
-exit 0
+}
+
+if [ "$#" -gt 0 ]; then
+    isRunning <%= dockerName %>-peer0.org1.example.com-$1-$2
+else
+  for container in <%= dockerName %>_orderer.example.com <%= dockerName %>_ca.org1.example.com <%= dockerName %>_peer0.org1.example.com <%= dockerName %>_couchdb <%= dockerName %>_logspout; do
+    isRunning $container;
+  done
+fi
+exit 0

package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-fabric",
-    "version": "0.0.31",
+    "version": "0.0.32",
     "description": "Yeoman generator for Hyperledger Fabric",
     "main": "generators/app/index.js",
     "scripts": {