From d84863340c1cf1ae0a56a3047f424a2704701a19 Mon Sep 17 00:00:00 2001
From: Matthew B White <whitemat@uk.ibm.com>
Date: Fri, 13 Dec 2019 13:53:35 +0000
Subject: [PATCH] [FAB-16844] Correct BYFN CC name

Correct chaincode name regexp in byfn.sh so it is not restricted
to one named chaincode.

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
---
 first-network/byfn.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/first-network/byfn.sh b/first-network/byfn.sh
index 611dbb97e8..588c56b913 100755
--- a/first-network/byfn.sh
+++ b/first-network/byfn.sh
@@ -90,7 +90,7 @@ function askProceed() {
 # Obtain CONTAINER_IDS and remove them
 # TODO Might want to make this optional - could clear other containers
 function clearContainers() {
-  CONTAINER_IDS=$(docker ps -a | awk '($2 ~ /dev-peer.*.mycc.*/) {print $1}')
+  CONTAINER_IDS=$(docker ps -a | awk '($2 ~ /dev-peer.*/) {print $1}')
   if [ -z "$CONTAINER_IDS" -o "$CONTAINER_IDS" == " " ]; then
     echo "---- No containers available for deletion ----"
   else
@@ -102,7 +102,7 @@ function clearContainers() {
 # specifically the following images are often left behind:
 # TODO list generated image naming patterns
 function removeUnwantedImages() {
-  DOCKER_IMAGE_IDS=$(docker images | awk '($1 ~ /dev-peer.*.mycc.*/) {print $3}')
+  DOCKER_IMAGE_IDS=$(docker images | awk '($1 ~ /dev-peer.*/) {print $3}')
   if [ -z "$DOCKER_IMAGE_IDS" -o "$DOCKER_IMAGE_IDS" == " " ]; then
     echo "---- No images available for deletion ----"
   else