public/mailcow-dockerized
1
0 Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-10-22 09:13:26 +00:00
Code Issues Releases Wiki Activity

Fix Docker Compose recognition for docker-compose syntax

Browse Source
This commit is contained in:
DerLinkman committed 2022-06-07 18:34:41 +02:00
1 parent fd853cfc6f
commit 141b397c82
4 files changed
+12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

generate_config.sh
+3
View File
@@ -32,6 +32,9 @@ done
echo "checking docker compose version..."; echo "checking docker compose version...";
if docker compose >/dev/null 2>&1; then if docker compose >/dev/null 2>&1; then
echo -e "\e[32mFound Compose v2!\e[0m" 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 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[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" echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"
helper-scripts/_cold-standby.sh
+3
View File
@@ -88,6 +88,9 @@ function preflight_local_checks() {
echo "checking docker compose version..."; echo "checking docker compose version...";
if docker compose >/dev/null 2>&1; then if docker compose >/dev/null 2>&1; then
echo -e "\e[32mFound Compose v2 on local machine!\e[0m" 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 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[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" echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"
helper-scripts/backup_and_restore.sh
+3
View File
@@ -80,6 +80,9 @@ echo "checking docker compose version...";
if docker compose >/dev/null 2>&1; then if docker compose >/dev/null 2>&1; then
echo -e "\e[32mFound Compose v2!\e[0m" echo -e "\e[32mFound Compose v2!\e[0m"
COMPOSE_COMMAND="docker compose" 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 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[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" echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"
update.sh
+3
View File
@@ -49,6 +49,9 @@ echo "checking docker compose version...";
if docker compose >/dev/null 2>&1; then if docker compose >/dev/null 2>&1; then
echo -e "\e[32mFound Compose v2!\e[0m" echo -e "\e[32mFound Compose v2!\e[0m"
COMPOSE_COMMAND="docker compose" 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 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[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" echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"