From 78cb65ec38e30358f848350c6e1df218a2dcc290 Mon Sep 17 00:00:00 2001 From: Eduardo Apolinario <653394+eapolinario@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:09:37 -0500 Subject: [PATCH] Use uv in all docker images (#3137) Signed-off-by: Eduardo Apolinario Co-authored-by: Eduardo Apolinario --- plugins/flytekit-flyteinteractive/Dockerfile | 3 ++- plugins/flytekit-openai/Dockerfile.batch | 5 +++-- plugins/flytekit-spark/Dockerfile | 4 +++- plugins/flytekit-sqlalchemy/Dockerfile | 14 ++++++++------ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/plugins/flytekit-flyteinteractive/Dockerfile b/plugins/flytekit-flyteinteractive/Dockerfile index b07627b065..e9a4105228 100644 --- a/plugins/flytekit-flyteinteractive/Dockerfile +++ b/plugins/flytekit-flyteinteractive/Dockerfile @@ -22,7 +22,8 @@ RUN apt-get update \ && tar -xzf /tmp/code-server/code-server-4.19.0-linux-${TARGETARCH}.tar.gz -C /tmp/code-server/ \ && wget --no-check-certificate https://open-vsx.org/api/ms-python/python/2023.20.0/file/ms-python.python-2023.20.0.vsix -P /tmp/code-server \ && wget --no-check-certificate https://open-vsx.org/api/ms-toolsai/jupyter/2023.9.100/file/ms-toolsai.jupyter-2023.9.100.vsix -P /tmp/code-server \ - && pip install --no-cache-dir -U flytekitplugins-flyteinteractive==$VERSION flytekit==$VERSION \ + && pip install --no-cache-dir uv \ + && uv pip install --system --no-cache-dir -U flytekitplugins-flyteinteractive==$VERSION flytekit==$VERSION \ && apt-get clean autoclean \ && apt-get autoremove --yes \ && rm -rf /var/lib/{apt,dpkg,cache,log}/ \ diff --git a/plugins/flytekit-openai/Dockerfile.batch b/plugins/flytekit-openai/Dockerfile.batch index 2174a82543..39191e9f26 100644 --- a/plugins/flytekit-openai/Dockerfile.batch +++ b/plugins/flytekit-openai/Dockerfile.batch @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION +ARG PYTHON_VERSION=3.12 FROM python:${PYTHON_VERSION}-slim-bookworm WORKDIR /root @@ -8,7 +8,8 @@ ENV PYTHONPATH /root ARG VERSION -RUN pip install flytekitplugins-openai==$VERSION \ +RUN pip install uv --no-cache-dir \ + && uv pip install --system --no-cache-dir -U flytekitplugins-openai==$VERSION \ flytekit==$VERSION RUN useradd -u 1000 flytekit diff --git a/plugins/flytekit-spark/Dockerfile b/plugins/flytekit-spark/Dockerfile index 6e89aab741..59ca1dfdac 100644 --- a/plugins/flytekit-spark/Dockerfile +++ b/plugins/flytekit-spark/Dockerfile @@ -8,7 +8,9 @@ RUN ln -s /usr/bin/python3 /usr/bin/python RUN apt-get update && apt-get install -y wget ARG VERSION -RUN pip install --no-cache-dir flytekitplugins-spark==$VERSION flytekit==$VERSION + +RUN pip install uv --no-cache-dir \ + && uv pip install --system --no-cache-dir -U flytekitplugins-spark==$VERSION flytekit==$VERSION RUN wget https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-aws/3.2.2/hadoop-aws-3.2.2.jar -P /opt/spark/jars && \ wget https://repo1.maven.org/maven2/com/amazonaws/aws-java-sdk-bundle/1.12.262/aws-java-sdk-bundle-1.12.262.jar -P /opt/spark/jars diff --git a/plugins/flytekit-sqlalchemy/Dockerfile b/plugins/flytekit-sqlalchemy/Dockerfile index 4b29e67dea..c255bd6f61 100644 --- a/plugins/flytekit-sqlalchemy/Dockerfile +++ b/plugins/flytekit-sqlalchemy/Dockerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION +ARG PYTHON_VERSION=3.12 FROM python:${PYTHON_VERSION}-slim-bookworm WORKDIR /root @@ -8,11 +8,13 @@ ENV PYTHONPATH /root ARG VERSION -RUN pip install sqlalchemy \ - psycopg2-binary \ - pymysql \ - flytekitplugins-sqlalchemy==$VERSION \ - flytekit==$VERSION +RUN pip install uv --no-cache-dir \ + && uv pip install --system --no-cache-dir -U \ + sqlalchemy \ + psycopg2-binary \ + pymysql \ + flytekitplugins-sqlalchemy==$VERSION \ + flytekit==$VERSION RUN useradd -u 1000 flytekit RUN chown flytekit: /root