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 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"