Skip to content

Commit fd35be5

Browse files
committed
fix: try to fix imagespec error
-e Signed-off-by: machichima <nary12321@gmail.com>
1 parent 818cf34 commit fd35be5

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

flytekit/image_spec/default_builder.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
--mount=type=bind,target=uv.lock,src=uv.lock \
3030
--mount=type=bind,target=pyproject.toml,src=pyproject.toml \
3131
$PIP_SECRET_MOUNT \
32-
uv sync $PIP_INSTALL_ARGS && \
33-
chown -R flytekit /root/.venv
32+
uv sync $PIP_INSTALL_ARGS
3433
WORKDIR /
3534
3635
# Update PATH and UV_PYTHON to point to the venv created by uv sync
@@ -55,12 +54,12 @@
5554
--mount=type=bind,target=poetry.lock,src=poetry.lock \
5655
--mount=type=bind,target=pyproject.toml,src=pyproject.toml \
5756
$PIP_SECRET_MOUNT \
58-
poetry install $PIP_INSTALL_ARGS && \
59-
chown -R flytekit /root/.venv
57+
poetry install $PIP_INSTALL_ARGS
58+
6059
WORKDIR /
6160
6261
# Update PATH and UV_PYTHON to point to venv
63-
ENV PATH="/root/.venv/bin:$$PATH" \
62+
ENV PATH="/root/.venv/bin:$$PATH" \
6463
UV_PYTHON=/root/.venv/bin/python
6564
"""
6665
)
@@ -82,7 +81,6 @@
8281
$APT_PACKAGES
8382
""")
8483

85-
# make sure that micromamba python installation is owned by flytekit user
8684
MICROMAMBA_INSTALL_COMMAND_TEMPLATE = Template("""\
8785
RUN --mount=type=cache,sharing=locked,mode=0777,target=/opt/micromamba/pkgs,\
8886
id=micromamba \
@@ -93,8 +91,7 @@
9391
python=$PYTHON_VERSION $CONDA_PACKAGES \
9492
|| micromamba install -n runtime --root-prefix /opt/micromamba \
9593
-c conda-forge $CONDA_CHANNELS \
96-
python=$PYTHON_VERSION $CONDA_PACKAGES ) && \
97-
chown -R flytekit /opt/micromamba
94+
python=$PYTHON_VERSION $CONDA_PACKAGES )
9895
""")
9996

10097
DOCKER_FILE_TEMPLATE = Template("""\
@@ -112,7 +109,7 @@
112109
mkdir -p /etc/ssl/certs/ && cp /tmp/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
113110
114111
RUN id -u flytekit || useradd --create-home --shell /bin/bash flytekit
115-
RUN chown -R flytekit /root && chown -R flytekit /home
112+
RUN chown flytekit /root && chown -R flytekit /home
116113
117114
$INSTALL_PYTHON_TEMPLATE
118115
@@ -125,7 +122,7 @@
125122
SSL_CERT_DIR=/etc/ssl/certs \
126123
$ENV
127124
128-
$PYTHON_INSTALL_COMMAND
125+
$UV_PYTHON_INSTALL_COMMAND
129126
130127
# Adds nvidia just in case it exists
131128
ENV PATH="$$PATH:/usr/local/nvidia/bin:/usr/local/cuda/bin" \
@@ -343,7 +340,7 @@ def create_docker_context(image_spec: ImageSpec, tmp_dir: Path):
343340
)
344341
raise ValueError(msg)
345342

346-
python_install_command = prepare_python_install(image_spec, tmp_dir)
343+
uv_python_install_command = prepare_python_install(image_spec, tmp_dir)
347344
env_dict = {"PYTHONPATH": "/root"}
348345

349346
if image_spec.env:
@@ -429,11 +426,11 @@ def create_docker_context(image_spec: ImageSpec, tmp_dir: Path):
429426
_f_img_id_env = f"{_F_IMG_ID}={image_spec.id}"
430427

431428
docker_content = DOCKER_FILE_TEMPLATE.substitute(
429+
UV_PYTHON_INSTALL_COMMAND=uv_python_install_command,
430+
APT_INSTALL_COMMAND=apt_install_command,
432431
INSTALL_PYTHON_TEMPLATE=python_install_template.template,
433432
EXTRA_PATH=python_install_template.extra_path,
434433
PYTHON_EXEC=python_install_template.python_exec,
435-
APT_INSTALL_COMMAND=apt_install_command,
436-
PYTHON_INSTALL_COMMAND=python_install_command,
437434
BASE_IMAGE=base_image,
438435
ENV=env,
439436
_F_IMG_ID_ENV=_f_img_id_env,

0 commit comments

Comments
 (0)