Merge branch 'main' into fix-issues

loxilb-io · Nov 17, 2023 · 894c23a · 894c23a
2 parents 7bc9f21 + c6d82c9
commit 894c23a
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/cicd/common.sh b/cicd/common.sh
@@ -181,9 +181,8 @@ get_llb_peerIP() {
 ## Deletes a docker host
 ## arg1 - hostname 
 delete_docker_host() {
-  id=`docker ps -f name=$1| grep -w $1 | cut  -d " "  -f 1 | grep -iv  "CONTAINER"`
-  if [ "$id" != "" ]; then
-    docker stop $1 2>&1 >> /dev/null
+  if docker stop $1 2>&1 >> /dev/null
+  then
     hd="true"
     ka=`docker ps -f name=ka_$1| grep -w ka_$1 | cut  -d " "  -f 1 | grep -iv  "CONTAINER"`
     loxilbs=( "${loxilbs[@]/$1}" )
@@ -196,9 +195,7 @@ delete_docker_host() {
     $hns del $1
     sudo rm -fr "$hexist/$1" 2>&1 >> /dev/null
   fi
-  if [ "$id" != "" ]; then
-    docker rm $1 2>&1 >> /dev/null
-  fi
+  docker rm $1 2>&1 >> /dev/null || true
 }
 
 ## Connects two docker hosts