ashb commented on code in PR #26612:
URL: https://github.com/apache/airflow/pull/26612#discussion_r985790486
##########
dev/breeze/src/airflow_breeze/params/shell_params.py:
##########
@@ -221,30 +232,42 @@ def compose_files(self):
f"from sources but from {self.use_airflow_version}[/]"
)
self.mount_sources = MOUNT_REMOVE
+ if self.forward_ports:
+ compose_file_list.append(DOCKER_COMPOSE_DIR / "base-ports.yml")
if self.mount_sources == MOUNT_SELECTED:
- compose_ci_file.extend([local_docker_compose_file])
+ compose_file_list.append(DOCKER_COMPOSE_DIR / "local.yml")
elif self.mount_sources == MOUNT_ALL:
- compose_ci_file.extend([local_all_sources_docker_compose_file])
+ compose_file_list.append(DOCKER_COMPOSE_DIR /
"local-all-sources.yml")
elif self.mount_sources == MOUNT_REMOVE:
- compose_ci_file.extend([remove_sources_docker_compose_file])
+ compose_file_list.append(DOCKER_COMPOSE_DIR / "remove-sources.yml")
if self.forward_credentials:
- compose_ci_file.append(forward_credentials_docker_compose_file)
+ compose_file_list.append(DOCKER_COMPOSE_DIR /
"forward-credentials.yml")
if self.use_airflow_version is not None:
- compose_ci_file.append(remove_sources_docker_compose_file)
+ compose_file_list.append(DOCKER_COMPOSE_DIR / "remove-sources.yml")
if self.include_mypy_volume:
- compose_ci_file.append(mypy_docker_compose_file)
+ compose_file_list.append(DOCKER_COMPOSE_DIR / "mypy.yml")
if "all" in self.integration:
integrations = AVAILABLE_INTEGRATIONS
else:
integrations = self.integration
if len(integrations) > 0:
for integration in integrations:
-
compose_ci_file.append(f"{str(SCRIPTS_CI_DIR)}/docker-compose/integration-{integration}.yml")
- return os.pathsep.join(compose_ci_file)
+ compose_file_list.append(DOCKER_COMPOSE_DIR /
f"integration-{integration}.yml")
+ return os.pathsep.join([os.fspath(f) for f in compose_file_list])
@property
def command_passed(self):
cmd = None
if len(self.extra_args) > 0:
cmd = str(self.extra_args[0])
return cmd
+
+ @property
+ def mssql_data_volume(self) -> str:
+ docker_filesystem = get_filesystem_type("/var/lib/docker")
Review Comment:
This is run from the host isn't it? If so this call might not get the right
info in cases of Docker Desktop etc. Does that matter?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
