Skip to content

Commit

Permalink
Adds mssql volumes to "all" backends selection (#24123)
Browse files Browse the repository at this point in the history
The "stop" command of Breeze uses "all" backend to remove all
volumes - but mssql has special approach where the volumes
defined depend on the filesystem used and we need to add the
specific docker-compose files to list of files used when
we use stop command.
  • Loading branch information
potiuk authored Jun 2, 2022
1 parent ddb2a4f commit 572112b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions dev/breeze/src/airflow_breeze/params/shell_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ def compose_files(self):
backend_files = []
for backend in ALLOWED_BACKENDS:
backend_files.extend(self.get_backend_compose_files(backend))
compose_ci_file.append(f"{str(SCRIPTS_CI_DIR)}/docker-compose/backend-mssql-bind-volume.yml")
compose_ci_file.append(f"{str(SCRIPTS_CI_DIR)}/docker-compose/backend-mssql-docker-volume.yml")
local_docker_compose_file = f"{str(SCRIPTS_CI_DIR)}/docker-compose/local.yml"
local_all_sources_docker_compose_file = f"{str(SCRIPTS_CI_DIR)}/docker-compose/local-all-sources.yml"
files_docker_compose_file = f"{str(SCRIPTS_CI_DIR)}/docker-compose/files.yml"
Expand Down
3 changes: 2 additions & 1 deletion dev/breeze/src/airflow_breeze/utils/docker_command_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from airflow_breeze.params.common_build_params import CommonBuildParams
from airflow_breeze.params.shell_params import ShellParams
from airflow_breeze.utils.host_info_utils import get_host_group_id, get_host_os, get_host_user_id
from airflow_breeze.utils.path_utils import AIRFLOW_SOURCES_ROOT
from airflow_breeze.utils.path_utils import AIRFLOW_SOURCES_ROOT, MSSQL_DATA_VOLUME

try:
from packaging import version
Expand Down Expand Up @@ -537,6 +537,7 @@ def update_expected_environment_variables(env: Dict[str, str]) -> None:
set_value_to_default_if_not_set(env, 'LIST_OF_INTEGRATION_TESTS_TO_RUN', "")
set_value_to_default_if_not_set(env, 'LOAD_DEFAULT_CONNECTIONS', "false")
set_value_to_default_if_not_set(env, 'LOAD_EXAMPLES', "false")
set_value_to_default_if_not_set(env, 'MSSQL_DATA_VOLUME', str(MSSQL_DATA_VOLUME))
set_value_to_default_if_not_set(env, 'PACKAGE_FORMAT', ALLOWED_PACKAGE_FORMATS[0])
set_value_to_default_if_not_set(env, 'PRINT_INFO_FROM_SCRIPTS', "true")
set_value_to_default_if_not_set(env, 'PYTHONDONTWRITEBYTECODE', "true")
Expand Down

0 comments on commit 572112b

Please sign in to comment.