Skip to content

Set _F_IMG_ID env var all the way at the bottom during ImageSpec builds #3227

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

Merged
pingsutw merged 5 commits into from
May 6, 2025
Merged

Set _F_IMG_ID env var all the way at the bottom during ImageSpec builds #3227

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
195e795
move _F_IMG_ID to the bottom
redartera Apr 15, 2025
4853f0c
Merge branch 'master' into default-builder-f-img-id-move-down
redartera Apr 29, 2025
69dbf83
Merge branch 'flyteorg:master' into default-builder-f-img-id-move-down
redartera May 2, 2025
02c6513
apply lint
redartera May 4, 2025
2e948c7
Merge branch 'flyteorg:master' into default-builder-f-img-id-move-down
redartera May 6, 2025
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
10 changes: 9 additions & 1 deletion flytekit/image_spec/default_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@
USER flytekit
RUN mkdir -p $$HOME && \
echo "export PATH=$$PATH" >> $$HOME/.profile

# NOTE: Important to set this env var all the way at the bottom
# Otherwise the slightest change to an imagespec's ID would unnecessarily invalidate
# too many layers in the build cache.
ENV $_F_IMG_ID_ENV
""")

DEFAULT_UV_IMAGE = "ghcr.io/astral-sh/uv:0.5.1"
Expand Down Expand Up @@ -332,7 +337,7 @@ def create_docker_context(image_spec: ImageSpec, tmp_dir: Path):
raise ValueError(msg)

uv_python_install_command = prepare_python_install(image_spec, tmp_dir)
env_dict = {"PYTHONPATH": "/root", _F_IMG_ID: image_spec.id}
env_dict = {"PYTHONPATH": "/root"}

if image_spec.env:
env_dict.update(image_spec.env)
Expand Down Expand Up @@ -414,6 +419,8 @@ def create_docker_context(image_spec: ImageSpec, tmp_dir: Path):
uv_image = image_spec.builder_config.get("uv_image", uv_image)
micromamba_image = image_spec.builder_config.get("micromamba_image", micromamba_image)

_f_img_id_env = f"{_F_IMG_ID}={image_spec.id}"

docker_content = DOCKER_FILE_TEMPLATE.substitute(
UV_PYTHON_INSTALL_COMMAND=uv_python_install_command,
APT_INSTALL_COMMAND=apt_install_command,
Expand All @@ -422,6 +429,7 @@ def create_docker_context(image_spec: ImageSpec, tmp_dir: Path):
PYTHON_EXEC=python_install_template.python_exec,
BASE_IMAGE=base_image,
ENV=env,
_F_IMG_ID_ENV=_f_img_id_env,
COPY_COMMAND_RUNTIME=copy_command_runtime,
ENTRYPOINT=entrypoint,
RUN_COMMANDS=run_commands,
Expand Down
Loading