From 141b397c82b717236bdb3a76ec7684442bf694e7 Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Tue, 7 Jun 2022 18:34:41 +0200 Subject: [PATCH] Fix Docker Compose recognition for docker-compose syntax --- generate_config.sh | 3 +++ helper-scripts/_cold-standby.sh | 3 +++ helper-scripts/backup_and_restore.sh | 3 +++ update.sh | 3 +++ 4 files changed, 12 insertions(+) diff --git a/generate_config.sh b/generate_config.sh index 601d8ca2..35601098 100755 --- a/generate_config.sh +++ b/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" diff --git a/helper-scripts/_cold-standby.sh b/helper-scripts/_cold-standby.sh index ca205605..534add48 100755 --- a/helper-scripts/_cold-standby.sh +++ b/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" diff --git a/helper-scripts/backup_and_restore.sh b/helper-scripts/backup_and_restore.sh index b89c19d4..15407aae 100755 --- a/helper-scripts/backup_and_restore.sh +++ b/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" diff --git a/update.sh b/update.sh index 6d01edba..16e6f9a9 100755 --- a/update.sh +++ b/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"