Skip to content

[do not merge] add cargo utility for image builds that need it #1085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cosmicBboy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[do not merge] add cargo utility for image builds that need it #1085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions maint_tools/build_default_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
from flyte.extend import ImageBuildEngine


def _with_cargo(image: Image) -> Image:
"""Rust toolchain for packages (e.g. snowflake-connector-python) that build from source."""
return (
image.with_apt_packages("curl", "build-essential", "ca-certificates", "pkg-config", "libssl-dev")
.with_commands(["sh -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y'"])
.with_env_vars({"PATH": "/root/.cargo/bin:${PATH}"})
)


async def build_flyte_image(registry: str | None = None, name: str | None = None, builder: str | None = "local"):
"""
Build the SDK default Debian-based image, optionally overriding
Expand Down Expand Up @@ -47,10 +56,13 @@ async def build_flyte_connector_image(
name = "flyte-connectors"

if "dev" in __version__:
default_image = _with_cargo(
Image.from_debian_base(registry=registry, name=name).with_env_vars(
{"SETUPTOOLS_SCM_PRETEND_VERSION": "9.9.9"}
)
)
default_image = (
Image.from_debian_base(registry=registry, name=name)
.with_env_vars({"SETUPTOOLS_SCM_PRETEND_VERSION": "9.9.9"})
.with_uv_project(
default_image.with_uv_project(
pyproject_file=(Path(__file__).parent.parent / "plugins/bigquery/pyproject.toml"),
pre=True,
project_install_mode="install_project",
Expand All @@ -71,7 +83,7 @@ async def build_flyte_connector_image(
.with_local_v2()
)
else:
default_image = Image.from_debian_base(registry=registry, name=name).with_pip_packages(
default_image = _with_cargo(Image.from_debian_base(registry=registry, name=name)).with_pip_packages(
"flyteplugins-bigquery", "flyteplugins-snowflake", "flyteplugins-databricks", pre=True
)
suffix = __version__ if __version__.startswith("v") else f"v{__version__}".replace("+", "-")
Expand Down
Loading