Fix the compose version detection

blockapps · Jul 25, 2024 · 794b342 · 794b342
1 parent aac8d80
commit 794b342
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 25 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -5,6 +5,7 @@
 STRATO versions supported: v11.3.1+
 
 - Added the `notification-server` script
+- Fixed the error with detecting the Compose version in utility server scripts
 
 ## 4.5.0
 

diff --git a/highway b/highway
@@ -88,16 +88,16 @@ then
     exit 1
 fi
 
-if ! docker-compose -v &> /dev/null
+if ! docker compose version  &> /dev/null && ! docker-compose -v  &> /dev/null
 then
-    echo -e "${Red}Error: docker-compose is required: https://docs.docker.com/compose/install/"
+    echo -e "${Red}Error: Docker Compose is required: https://docs.docker.com/compose/install/"
     exit 2
 else
   if ! docker compose version &> /dev/null
   then
     docker_compose="docker-compose -p highway -f docker-compose.highway.yml --log-level ERROR"
   else
-    docker_compose="docker compose -p highway -f docker-compose.highway.yml"
+    docker_compose="docker -l error compose -p highway -f docker-compose.highway.yml"
   fi
 fi
 

diff --git a/identity b/identity
@@ -93,16 +93,16 @@ then
     exit 1
 fi
 
-if ! docker-compose -v &> /dev/null
+if ! docker compose version  &> /dev/null && ! docker-compose -v  &> /dev/null
 then
-    echo -e "${Red}Error: docker-compose is required: https://docs.docker.com/compose/install/"
+    echo -e "${Red}Error: Docker Compose is required: https://docs.docker.com/compose/install/"
     exit 2
 else
   if ! docker compose version &> /dev/null
   then
     docker_compose="docker-compose -p identity -f docker-compose.identity.yml --log-level ERROR"
   else
-    docker_compose="docker compose -p identity -f docker-compose.identity.yml"
+    docker_compose="docker -l error compose -p identity -f docker-compose.identity.yml"
   fi
 fi
 

diff --git a/notification-server b/notification-server
@@ -81,16 +81,16 @@ then
     exit 1
 fi
 
-if ! docker-compose -v &> /dev/null
+if ! docker compose version  &> /dev/null && ! docker-compose -v  &> /dev/null
 then
-    echo -e "${Red}Error: docker-compose is required: https://docs.docker.com/compose/install/"
+    echo -e "${Red}Error: Docker Compose is required: https://docs.docker.com/compose/install/"
     exit 2
 else
   if ! docker compose version &> /dev/null
   then
     docker_compose="docker-compose -p notification-server -f docker-compose.notification.yml --log-level ERROR"
   else
-    docker_compose="docker compose -p notification-server -f docker-compose.notification.yml"
+    docker_compose="docker -l error compose -p notification-server -f docker-compose.notification.yml"
   fi
 fi
 

diff --git a/payment-server b/payment-server
@@ -91,16 +91,16 @@ then
     exit 1
 fi
 
-if ! docker-compose -v &> /dev/null
+if ! docker compose version  &> /dev/null && ! docker-compose -v  &> /dev/null
 then
-    echo -e "${Red}Error: docker-compose is required: https://docs.docker.com/compose/install/"
+    echo -e "${Red}Error: Docker Compose is required: https://docs.docker.com/compose/install/"
     exit 2
 else
   if ! docker compose version &> /dev/null
   then
     docker_compose="docker-compose -p payment-server -f docker-compose.payment.yml --log-level ERROR"
   else
-    docker_compose="docker compose -p payment-server -f docker-compose.payment.yml"
+    docker_compose="docker -l error compose -p payment-server -f docker-compose.payment.yml"
   fi
 fi
 

diff --git a/strato b/strato
@@ -170,7 +170,7 @@ fi
 
 if ! docker compose version  &> /dev/null && ! docker-compose -v  &> /dev/null
 then
-    echo -e "${Red}Error: docker-compose is required: https://docs.docker.com/compose/install/"
+    echo -e "${Red}Error: Docker Compose is required: https://docs.docker.com/compose/install/"
     exit 2
 else
   if ! docker compose version &> /dev/null
@@ -336,15 +336,6 @@ then
   export isRootNode=true
   # Generate random networkID if not provided for --single mode
   export networkID=${networkID:-$(($RANDOM * $RANDOM * $RANDOM))}
-  
-  # TODO: Update and re-enable the in-place single node restart process
-  #if [[ $(docker ps -a | grep strato${CNAME_SEP}strato${CNAME_SEP}1) ]]; then
-  #  echo -e "${BYellow}Updating the existing STRATO Single node instance - getting it's blockstanbul variables...${NC}"
-  #  STRATO_ENV_VARS=$(docker inspect --format='{{range .Config.Env}}{{println .}}{{end}}' strato${CNAME_SEP}strato${CNAME_SEP}1)
-  #  export blockstanbulAdmins=$(echo "${STRATO_ENV_VARS}" | grep blockstanbulAdmins | awk -F"ulAdmins=" '{print $2}')
-  #  export validators=$(echo "${STRATO_ENV_VARS}" | grep validators | awk -F"alidators=" '{print $2}')
-  #  export generateKey=false
-  #fi
 
 else
   if [[ ${generateKey} = false ]]; then

diff --git a/vault b/vault
@@ -123,17 +123,17 @@ then
     exit 1
 fi
 
-if ! docker-compose -v &> /dev/null
+if ! docker compose version  &> /dev/null && ! docker-compose -v  &> /dev/null
 then
-    echo -e "${Red}Error: docker-compose is required: https://docs.docker.com/compose/install/"
+    echo -e "${Red}Error: Docker Compose is required: https://docs.docker.com/compose/install/"
     exit 2
 else
   if ! docker compose version &> /dev/null
   then
     docker_compose="docker-compose -p vault -f docker-compose.vault.yml --log-level ERROR"
     CNAME_SEP="_"
   else
-    docker_compose="docker compose -p vault -f docker-compose.vault.yml"
+    docker_compose="docker -l error compose -p vault -f docker-compose.vault.yml"
     CNAME_SEP="-"
   fi
 fi