[airflow] branch main updated: Fixes detection of version 2 of docker-compose (#17062)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 16564ca  Fixes detection of version 2 of docker-compose (#17062)
16564ca is described below

commit 16564cad6f2956ecb842455d9d6a6255f8d3d817
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sat Jul 17 22:18:27 2021 +0200

    Fixes detection of version 2 of docker-compose (#17062)
    
    Docker compose 2 added `v` in front of the version :(
---
 breeze | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/breeze b/breeze
index 0d209af..c991a53 100755
--- a/breeze
+++ b/breeze
@@ -591,9 +591,9 @@ function breeze::prepare_command_file() {
     cat <<EOF >"${file}"
 #!/usr/bin/env bash
 docker_compose_version=\$(docker-compose --version)
-if [[ \${docker_compose_version} =~ .*version\ 2.* ]]; then
+if [[ \${docker_compose_version} =~ .*version\ v2.* ]]; then
   echo
-  echo "${COLOR_RED}Docker Compose Beta version 2has bug that prevents breeze from running.${COLOR_RESET}"
+  echo "${COLOR_RED}Docker Compose Beta version v2 has a bug that prevents breeze from running.${COLOR_RESET}"
   echo "${COLOR_RED}You have: \${docker_compose_version}.${COLOR_RESET}"
   echo
   echo "${COLOR_YELLOW}Please switch to stable version via Docker Desktop -> Experimental or by running:${COLOR_RESET}"