This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v2-3-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit dcfb62a4c1ef95d830ad78bd1d474db2cdd16f07 Author: Jarek Potiuk <[email protected]> AuthorDate: Sat Aug 6 18:29:17 2022 +0200 Move "additional" build args from required to optional in Breeze (#25567) The "required" build args in Breeze are replaced with empty `--build-arg arg=`. This is problematic if those parameters will have default values set. We move them from required to optional to skip the build args entirely when "build" command is run. (cherry picked from commit f1d1914d73dfa9832ff69ed413f4ec39814e5837) --- .../src/airflow_breeze/params/build_ci_params.py | 18 +++++++++--------- .../src/airflow_breeze/params/build_prod_params.py | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dev/breeze/src/airflow_breeze/params/build_ci_params.py b/dev/breeze/src/airflow_breeze/params/build_ci_params.py index c5c9382811..6a4f967af1 100644 --- a/dev/breeze/src/airflow_breeze/params/build_ci_params.py +++ b/dev/breeze/src/airflow_breeze/params/build_ci_params.py @@ -62,15 +62,6 @@ class BuildCiParams(CommonBuildParams): @property def required_image_args(self) -> List[str]: return [ - "additional_airflow_extras", - "additional_dev_apt_command", - "additional_dev_apt_deps", - "additional_dev_apt_env", - "additional_pip_install_flags", - "additional_python_deps", - "additional_runtime_apt_command", - "additional_runtime_apt_deps", - "additional_runtime_apt_env", "airflow_branch", "airflow_constraints_mode", "airflow_constraints_reference", @@ -88,6 +79,15 @@ class BuildCiParams(CommonBuildParams): @property def optional_image_args(self) -> List[str]: return [ + "additional_airflow_extras", + "additional_dev_apt_command", + "additional_dev_apt_deps", + "additional_dev_apt_env", + "additional_pip_install_flags", + "additional_python_deps", + "additional_runtime_apt_command", + "additional_runtime_apt_deps", + "additional_runtime_apt_env", "dev_apt_command", "dev_apt_deps", "runtime_apt_command", diff --git a/dev/breeze/src/airflow_breeze/params/build_prod_params.py b/dev/breeze/src/airflow_breeze/params/build_prod_params.py index fd33396c51..738a61edf7 100644 --- a/dev/breeze/src/airflow_breeze/params/build_prod_params.py +++ b/dev/breeze/src/airflow_breeze/params/build_prod_params.py @@ -195,15 +195,6 @@ class BuildProdParams(CommonBuildParams): @property def required_image_args(self) -> List[str]: return [ - "additional_airflow_extras", - "additional_dev_apt_command", - "additional_dev_apt_deps", - "additional_dev_apt_env", - "additional_pip_install_flags", - "additional_python_deps", - "additional_runtime_apt_command", - "additional_runtime_apt_deps", - "additional_runtime_apt_env", "airflow_branch", "airflow_constraints_mode", "airflow_extras", @@ -227,6 +218,15 @@ class BuildProdParams(CommonBuildParams): @property def optional_image_args(self) -> List[str]: return [ + "additional_airflow_extras", + "additional_dev_apt_command", + "additional_dev_apt_deps", + "additional_dev_apt_env", + "additional_pip_install_flags", + "additional_python_deps", + "additional_runtime_apt_command", + "additional_runtime_apt_deps", + "additional_runtime_apt_env", "dev_apt_command", "dev_apt_deps", "runtime_apt_command",
