From a4fa8a4faea309df1c14b75b668e5ca9aaf19d7b Mon Sep 17 00:00:00 2001 From: Josiah Adenegan Date: Sat, 25 Nov 2023 20:36:40 +0000 Subject: [PATCH 1/2] Detect docker compose version of form v2.x --- generate_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate_config.sh b/generate_config.sh index 2b1d2c35e..10c54c93a 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -26,7 +26,7 @@ for bin in openssl curl docker git awk sha1sum grep cut; do done if docker compose > /dev/null 2>&1; then - if docker compose version --short | grep "^2." > /dev/null 2>&1; then + if docker compose version --short | grep -e "^2." -e "^v2." > /dev/null 2>&1; then COMPOSE_VERSION=native echo -e "\e[33mFound Docker Compose Plugin (native).\e[0m" echo -e "\e[33mSetting the DOCKER_COMPOSE_VERSION Variable to native\e[0m" @@ -553,4 +553,4 @@ else echo -e "\e[33mCannot determine current git repository version...\e[0m" fi -detect_bad_asn \ No newline at end of file +detect_bad_asn From de812221efaa2c36e2db7b40ff30c8a672c85f5c Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Tue, 28 Nov 2023 08:29:54 +0100 Subject: [PATCH 2/2] Implemented improved check in update.sh as well. --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 419f85f4e..f636b21ec 100755 --- a/update.sh +++ b/update.sh @@ -171,7 +171,7 @@ remove_obsolete_nginx_ports() { detect_docker_compose_command(){ if ! [[ "${DOCKER_COMPOSE_VERSION}" =~ ^(native|standalone)$ ]]; then if docker compose > /dev/null 2>&1; then - if docker compose version --short | grep "2." > /dev/null 2>&1; then + if docker compose version --short | grep -e "^2." -e "^v2." > /dev/null 2>&1; then DOCKER_COMPOSE_VERSION=native COMPOSE_COMMAND="docker compose" echo -e "\e[33mFound Docker Compose Plugin (native).\e[0m"