From bd24e8ffa068ad3e39431fa48ec1c437bb0e0f02 Mon Sep 17 00:00:00 2001
From: Sahil Ahuja <sahilahuja@gmail.com>
Date: Sat, 8 Mar 2025 03:26:21 +0530
Subject: [PATCH] Making docker scripts more robust

---
 repo-template/node-based-repo/fab/sh/compose_down.sh      | 2 +-
 repo-template/node-based-repo/fab/sh/compose_up.sh        | 8 +++++---
 .../node-based-repo/fab/sh/docker_network_create.sh       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/repo-template/node-based-repo/fab/sh/compose_down.sh b/repo-template/node-based-repo/fab/sh/compose_down.sh
index 7e111c3..1851750 100755
--- a/repo-template/node-based-repo/fab/sh/compose_down.sh
+++ b/repo-template/node-based-repo/fab/sh/compose_down.sh
@@ -4,6 +4,6 @@
 set -x
 docker compose \
     -f fab/d/docker-compose.yaml \
-    --project-name ${REPO_NAME} \
+    -p ${REPO_NAME} \
     --project-directory ${REPO_FOLDER} \
     down
diff --git a/repo-template/node-based-repo/fab/sh/compose_up.sh b/repo-template/node-based-repo/fab/sh/compose_up.sh
index 37ddb44..cb4a813 100755
--- a/repo-template/node-based-repo/fab/sh/compose_up.sh
+++ b/repo-template/node-based-repo/fab/sh/compose_up.sh
@@ -26,9 +26,10 @@ if [ "$ALREADY_RUNNING" -eq 0 ];
 then
   echo "Service already running, only opening shell"
 else
+  echo "Service not running, starting service"
   docker compose \
     -f fab/d/docker-compose.yaml \
-    --project-name ${REPO_NAME} \
+    -p ${REPO_NAME} \
     --project-directory ${REPO_FOLDER} \
     up -d
 fi
@@ -36,6 +37,7 @@ fi
 echo "Connecting to docker shell and running command $COMMAND..."
 docker compose \
   -f fab/d/docker-compose.yaml \
-  --project-name ${REPO_NAME} \
+  -p ${REPO_NAME} \
   --project-directory ${REPO_FOLDER} \
-  exec $REPO_NAME $COMMAND
\ No newline at end of file
+  exec $REPO_NAME $COMMAND
+ 
\ No newline at end of file
diff --git a/repo-template/node-based-repo/fab/sh/docker_network_create.sh b/repo-template/node-based-repo/fab/sh/docker_network_create.sh
index 685bfda..ce97e07 100755
--- a/repo-template/node-based-repo/fab/sh/docker_network_create.sh
+++ b/repo-template/node-based-repo/fab/sh/docker_network_create.sh
@@ -7,7 +7,7 @@
 NETWORK_EXISTS=0
 #This is necessary instead of using $? (previous command exit code) as we are set -e mode,
 #which exists the script on any error
-docker network ls | grep ${PARENT_PROJECT} || NETWORK_EXISTS=1
+docker network ls | grep " ${PARENT_PROJECT} " || NETWORK_EXISTS=1
 #0 if already exists, 1 if doesn't exist (0=no error)
 
 if [ "$NETWORK_EXISTS" -eq 0 ];