瀏覽代碼

Fix Docker Compose recognition for docker-compose syntax

DerLinkman 3 年之前
父節點
當前提交
141b397c82
共有 4 個文件被更改,包括 12 次插入0 次删除
  1. 3 0
      generate_config.sh
  2. 3 0
      helper-scripts/_cold-standby.sh
  3. 3 0
      helper-scripts/backup_and_restore.sh
  4. 3 0
      update.sh

+ 3 - 0
generate_config.sh

@@ -32,6 +32,9 @@ done
 echo "checking docker compose version...";
 if docker compose >/dev/null 2>&1; then
   echo -e "\e[32mFound Compose v2!\e[0m"
+elif docker-compose version --short | grep -m1 "^2" > /dev/null 2>&1; then
+  echo -e "\e[32mFound Compose v2!\e[0m"
+  COMPOSE_COMMAND="docker compose"  
 elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then
   echo -e "\e[33mWARN: Your machine is using Docker-Compose v1!\e[0m"
   echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"

+ 3 - 0
helper-scripts/_cold-standby.sh

@@ -88,6 +88,9 @@ function preflight_local_checks() {
   echo "checking docker compose version...";
   if docker compose >/dev/null 2>&1; then
     echo -e "\e[32mFound Compose v2 on local machine!\e[0m"
+  elif docker-compose version --short | grep -m1 "^2" > /dev/null 2>&1; then
+  echo -e "\e[32mFound Compose v2!\e[0m"
+  COMPOSE_COMMAND="docker compose"  
   elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then
     echo -e "\e[33mWARN: Your machine is using Docker-Compose v1!\e[0m"
     echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"

+ 3 - 0
helper-scripts/backup_and_restore.sh

@@ -80,6 +80,9 @@ echo "checking docker compose version...";
 if docker compose >/dev/null 2>&1; then
   echo -e "\e[32mFound Compose v2!\e[0m"
   COMPOSE_COMMAND="docker compose"
+elif docker-compose version --short | grep -m1 "^2" > /dev/null 2>&1; then
+  echo -e "\e[32mFound Compose v2!\e[0m"
+  COMPOSE_COMMAND="docker compose"  
 elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then
   echo -e "\e[33mWARN: Your machine is using Docker-Compose v1!\e[0m"
   echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"

+ 3 - 0
update.sh

@@ -49,6 +49,9 @@ echo "checking docker compose version...";
 if docker compose >/dev/null 2>&1; then
   echo -e "\e[32mFound Compose v2!\e[0m"
   COMPOSE_COMMAND="docker compose"
+elif docker-compose version --short | grep -m1 "^2" > /dev/null 2>&1; then
+  echo -e "\e[32mFound Compose v2!\e[0m"
+  COMPOSE_COMMAND="docker compose"
 elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then
   echo -e "\e[33mWARN: Your machine is using Docker-Compose v1!\e[0m"
   echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"