Dynamic version support with UV

Author: giaongo

.diploi/helm/app.yaml

@@ -41,19 +41,19 @@ spec:
           command: ["/bin/sh", "-c"]
           args:
             - |
+              set -e
+              uv python install {{ ((.Values.envMap.PYTHON_VERSION).value | default "3.12") | quote }}
+              uv venv .venv --clear
               if [ -f pyproject.toml ]; then
-                echo "Pyproject.toml found, installing dependencies with uv" && \
-                uv venv .venv --clear && \
-                uv sync --frozen --no-cache --link-mode=copy
+                uv sync
               elif [ -f requirements.txt ]; then
-                echo "requirements.txt found, installing dependencies with pip" && \
-                uv venv .venv --clear && \
-                uv pip install --python .venv/bin/python -r requirements.txt --link-mode=copy
-              else
-                echo "No dependency definition found" >&2
-                exit 1
-              fi && \
-              cp --remove-destination "$(readlink /app{{ .Values.folder }}/.venv/bin/python)" /app{{ .Values.folder }}/.venv/bin/python 2>/dev/null || :
+                uv pip install -r requirements.txt
+              fi
+          env:
+            - name: UV_PYTHON
+              value: {{ ((.Values.envMap.PYTHON_VERSION).value | default "3.12") | quote }}
+            - name: UV_PYTHON_INSTALL_DIR
+              value: /app{{ .Values.folder }}/.python
           workingDir: /app{{ .Values.folder }}
           volumeMounts:
             - name: app-mount
@@ -83,6 +83,10 @@ spec:
           {{- end }}
           {{- end }}
           env:
+            - name: UV_PYTHON
+              value: {{ ((.Values.envMap.PYTHON_VERSION).value | default "3.12") | quote }}
+            - name: UV_PYTHON_INSTALL_DIR
+              value: /app{{ .Values.folder }}/.python
             {{- range .Values.env }}
             - name: {{ .identifier }}
               value: {{ .value | quote }}

.python-version

@@ -1,39 +1,32 @@
 # Use a Python image with uv pre-installed
-FROM ghcr.io/astral-sh/uv:python3.11-bookworm
+FROM ghcr.io/astral-sh/uv:bookworm-slim
 
 # This will be set by the GitHub action to the folder containing this component.
 ARG FOLDER=/app
 
+# This will be set by the GitHub action if "PYTHON_VERSION" ENV is set in diploi.yaml
+ARG PYTHON_VERSION=3.12
+
+RUN mkdir -p /.cache/uv && chown -R 1000:1000 /.cache
+RUN mkdir -p /.local/share/uv/python && chown -R 1000:1000 /.local/share/uv
+
+COPY --chown=1000:1000 . /app
 WORKDIR ${FOLDER}
 
-# Enable bytecode compilation
 ENV UV_COMPILE_BYTECODE=1
-
-# Copy from the cache instead of linking since it's a mounted volume
 ENV UV_LINK_MODE=copy
+ENV PATH="$FOLDER/.venv/bin:$PATH"
+ENV UV_PYTHON=${PYTHON_VERSION}
+ENV HOME=/tmp
 
-# Ensure installed tools can be executed out of the box
-ENV UV_TOOL_BIN_DIR=/usr/local/bin
-
-COPY . /app
+USER 1000:1000
 
-RUN if [ -f requirements.txt ]; then \
-    echo "requirements.txt found, installing dependencies with uv pip" && \
-    uv venv .venv --clear && \
+RUN uv python install ${PYTHON_VERSION} && \
+    uv venv .venv && \
+    if [ -f pyproject.toml ]; then \
+    uv sync --locked --no-dev || uv sync --no-dev; \
+    elif [ -f requirements.txt ]; then \
     uv pip install -r requirements.txt; \
-    else \
-    echo "Using uv sync for dependency installation" && \
-    uv sync --locked --no-dev; \
     fi
 
-# Place executables in the environment at the front of the path
-ENV PATH="$FOLDER/.venv/bin:$PATH"
-
-# Reset the entrypoint, don't invoke `uv`
-ENTRYPOINT []
-
-EXPOSE 8000
-ENV PORT=8000
-ENV HOST="0.0.0.0"
-
 CMD ["uv", "run", "--frozen", "src/main.py"]

Dockerfile

@@ -1,47 +1,20 @@
-# Use a Python image with uv pre-installed
-FROM ghcr.io/astral-sh/uv:python3.11-bookworm
+FROM ghcr.io/astral-sh/uv:bookworm-slim
 
 # This will be set by the GitHub action to the folder containing this component.
 ARG FOLDER=/app
 
-COPY --chown=1000:1000 . /app
-WORKDIR ${FOLDER}
+RUN mkdir /app && chown 1000:1000 /app
 
-# Enable bytecode compilation
-ENV UV_COMPILE_BYTECODE=1
+RUN mkdir -p /.cache/uv && chown -R 1000:1000 /.cache
+RUN mkdir -p /.local/share/uv/python && chown -R 1000:1000 /.local/share/uv
+RUN mkdir -p /.local/bin && chown -R 1000:1000 /.local/bin
 
-# Ensure installed tools can be executed out of the box
-ENV UV_TOOL_BIN_DIR=/usr/local/bin
+WORKDIR /app
 
-# Place executables in the environment at the front of the path
+ENV UV_LINK_MODE=copy
+ENV UV_PYTHON_INSTALL_DIR=$FOLDER/.python
 ENV PATH="$FOLDER/.venv/bin:$PATH"
 
-# Fix uv + non-root environment
-ENV HOME=/tmp
-ENV XDG_DATA_HOME=/tmp/.local/share
-ENV XDG_CACHE_HOME=/tmp/.cache
-
-USER root
-RUN apt-get update && apt-get install -y nodejs npm \
-    && npm install -g nodemon \
-    && rm -rf /var/lib/apt/lists/*
-
-# Allow uv to use cache
-RUN mkdir -p /.cache/uv && chown 1000:1000 /.cache /.cache/uv
-
 USER 1000:1000
 
-EXPOSE 8000
-ENV PORT=8000
-ENV HOST="0.0.0.0"
-
-ENTRYPOINT ["/usr/local/bin/nodemon"]
-
-CMD ["--delay", "1", \
-    "--watch", "pyproject.toml", \
-    "--watch", "requirements.txt", \
-    "--watch", ".venv/lib/*", \ 
-    "--watch", ".venv/lib64/*", \
-    "--watch", "src", \ 
-    "--ext", "py", \
-    "--exec", "sh -c 'if [ -f pyproject.toml ]; then uv run --isolated --with . python src/main.py; elif [ -f requirements.txt ]; then uv run --isolated --with-requirements requirements.txt python src/main.py; else uv run --isolated python src/main.py; fi'"]
+CMD ["uv", "run", "python", "src/main.py"]