You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2022/08/06 11:09:13 UTC
[airflow] branch main updated: feat: breeze - support compose v2 (#25563)
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 439d9ba1bc feat: breeze - support compose v2 (#25563)
439d9ba1bc is described below
commit 439d9ba1bc867c69cc5d10a86fec10ee1461d3d0
Author: raphaelauv <ra...@users.noreply.github.com>
AuthorDate: Sat Aug 6 13:09:06 2022 +0200
feat: breeze - support compose v2 (#25563)
---
.../airflow_breeze/utils/docker_command_utils.py | 25 ++++++++++++++++------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py b/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
index 164caf546c..dca6139291 100644
--- a/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
+++ b/dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
@@ -271,13 +271,24 @@ def check_docker_compose_version(verbose: bool):
"""
version_pattern = re.compile(r'(\d+)\.(\d+)\.(\d+)')
docker_compose_version_command = ["docker-compose", "--version"]
- docker_compose_version_result = run_command(
- docker_compose_version_command,
- verbose=verbose,
- no_output_dump_on_exception=True,
- capture_output=True,
- text=True,
- )
+ try:
+ docker_compose_version_result = run_command(
+ docker_compose_version_command,
+ verbose=verbose,
+ no_output_dump_on_exception=True,
+ capture_output=True,
+ text=True,
+ )
+ except FileNotFoundError:
+ docker_compose_version_command = ["docker", "compose", "version"]
+ docker_compose_version_result = run_command(
+ docker_compose_version_command,
+ verbose=verbose,
+ no_output_dump_on_exception=True,
+ capture_output=True,
+ text=True,
+ )
+
if docker_compose_version_result.returncode == 0:
docker_compose_version = docker_compose_version_result.stdout
version_extracted = version_pattern.search(docker_compose_version)