From f72217b510e81784ba713f4c1db8f319895d116e Mon Sep 17 00:00:00 2001 From: Jarek Potiuk Date: Sat, 28 May 2022 16:41:12 +0200 Subject: [PATCH] Fix breeze failures when there is no buildx installed on Mac (#23988) If you have no buildx plugin installed on Mac (for example when you use colima instead of Docker Desktop) the breeze check was failing - but buildx in fact is not needed to run typical breeze commands, and breeze already has support for it - it was just wrongly handled. (cherry picked from commit 148013b2a88935a2bae5e4b3eb86acb50dd6efc9) --- dev/breeze/src/airflow_breeze/utils/run_utils.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dev/breeze/src/airflow_breeze/utils/run_utils.py b/dev/breeze/src/airflow_breeze/utils/run_utils.py index b811980f722bd..bbfdfcb4326c4 100644 --- a/dev/breeze/src/airflow_breeze/utils/run_utils.py +++ b/dev/breeze/src/airflow_breeze/utils/run_utils.py @@ -287,7 +287,6 @@ def check_if_buildx_plugin_installed(verbose: bool) -> bool: :param verbose: print commands when running :return True if the buildx plugin is installed. """ - is_buildx_available = False check_buildx = ['docker', 'buildx', 'version'] docker_buildx_version_result = run_command( check_buildx, @@ -295,14 +294,11 @@ def check_if_buildx_plugin_installed(verbose: bool) -> bool: no_output_dump_on_exception=True, capture_output=True, text=True, + check=False, ) - if ( - docker_buildx_version_result - and docker_buildx_version_result.returncode == 0 - and docker_buildx_version_result.stdout != '' - ): - is_buildx_available = True - return is_buildx_available + if docker_buildx_version_result.returncode == 0: + return True + return False def prepare_base_build_command(image_params: _CommonBuildParams, verbose: bool) -> List[str]: