From f2cef4387e01f6f50d4b553cc14406531b78d824 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Mon, 23 May 2022 16:29:10 +0200
Subject: [PATCH] (bug) fix #355 compatibility with the new docker-compose CLI

---
 CHANGELOG.md            |  1 +
 scripts/pg-analyzers.sh | 17 ++++++++++++++++-
 scripts/run.sh          | 15 +++++++++++++++
 setup/setup.sh          | 19 ++++++++++++++++++-
 setup/upgrade.sh        | 15 +++++++++++++++
 5 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1418a46c..0ed0b81e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Fix a bug: Missing of description of PlanCategory migration
 - Fix a bug: Unable to create plans for all group
 - Fix a bug: backPrevLocation button on Notification Center opens reset password page (#348)
+- Fix a bug: compatibility with the new docker-compose CLI (#355)
 - Fix a security issue: updated moment.js to 2.29.2. to fix [CVE-2022-24785](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24785)
 - Fix a security issue: updated nokogiri to 1.13.6 to fix [CVE-2022-298240](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-298240)
 - Fix a security issue: updated async to 2.6.4 to fix [CVE-2021-43138](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-43138)
diff --git a/scripts/pg-analyzers.sh b/scripts/pg-analyzers.sh
index 7fac40058..3d2861859 100755
--- a/scripts/pg-analyzers.sh
+++ b/scripts/pg-analyzers.sh
@@ -1,3 +1,18 @@
 #!/usr/bin/env bash
 
-docker-compose exec -T postgres psql -Upostgres -c \\dFd | head -n -2 | tail -n +3 | awk '{ print gensub(/([a-z]+)_stem/,"\\1","g",$3); }'
\ No newline at end of file
+docker-compose()
+{
+  if ! docker compose version 1>/dev/null 2>/dev/null
+  then
+    if ! \docker-compose version 1>/dev/null 2>/dev/null
+    then
+      echo -e "\e[91m[ ❌ ] docker-compose was not found, exiting...\e[39m" && exit 1
+    else
+      \docker-compose "$@"
+    fi
+  else
+    docker compose "$@"
+  fi
+}
+
+docker-compose exec -T postgres psql -Upostgres -c \\dFd | head -n -2 | tail -n +3 | awk '{ print gensub(/([a-z]+)_stem/,"\\1","g",$3); }'
diff --git a/scripts/run.sh b/scripts/run.sh
index 2ebb674e3..09e49c9ce 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -8,6 +8,21 @@ config() {
   SERVICE="$(yq eval '.services.*.image | select(. == "sleede/fab-manager*") | path | .[-2]' docker-compose.yml)"
 }
 
+docker-compose()
+{
+  if ! docker compose version 1>/dev/null 2>/dev/null
+  then
+    if ! \docker-compose version 1>/dev/null 2>/dev/null
+    then
+      echo -e "\e[91m[ ❌ ] docker-compose was not found, exiting...\e[39m" && exit 1
+    else
+      \docker-compose "$@"
+    fi
+  else
+    docker compose "$@"
+  fi
+}
+
 run()
 {
   config
diff --git a/setup/setup.sh b/setup/setup.sh
index 2a15f77b3..e37db3066 100755
--- a/setup/setup.sh
+++ b/setup/setup.sh
@@ -45,7 +45,7 @@ system_requirements()
       fi
     done
   fi
-  local _commands=("sudo" "curl" "sed" "openssl" "docker" "docker-compose" "systemctl")
+  local _commands=("sudo" "curl" "sed" "openssl" "docker" "systemctl")
   for _command in "${_commands[@]}"; do
     echo "detecting $_command..."
     if ! command -v "$_command"
@@ -54,9 +54,26 @@ system_requirements()
       echo -e "\e[91m[ ❌ ] $_command was not found, exiting...\e[39m" && exit 1
     fi
   done
+  echo "detecting docker-compose..."
+  docker-compose version
   printf "\e[92m[ ✔ ] All requirements successfully checked.\e[39m \n\n"
 }
 
+docker-compose()
+{
+  if ! docker compose version 1>/dev/null 2>/dev/null
+  then
+    if ! \docker-compose version 1>/dev/null 2>/dev/null
+    then
+      echo -e "\e[91m[ ❌ ] docker-compose was not found, exiting...\e[39m" && exit 1
+    else
+      \docker-compose "$@"
+    fi
+  else
+    docker compose "$@"
+  fi
+}
+
 is_root()
 {
   return $(id -u)
diff --git a/setup/upgrade.sh b/setup/upgrade.sh
index ba4e6cf67..f3e48e451 100644
--- a/setup/upgrade.sh
+++ b/setup/upgrade.sh
@@ -43,6 +43,21 @@ jq() {
   docker run --rm -i -v "${PWD}:/data" imega/jq "$@"
 }
 
+docker-compose()
+{
+  if ! docker compose version 1>/dev/null 2>/dev/null
+  then
+    if ! \docker-compose version 1>/dev/null 2>/dev/null
+    then
+      echo -e "\e[91m[ ❌ ] docker-compose was not found, exiting...\e[39m" && exit 1
+    else
+      \docker-compose "$@"
+    fi
+  else
+    docker compose "$@"
+  fi
+}
+
 # set $SERVICE and $YES_ALL
 config()
 {