Fix Dockerfiles (move UV_VERSION to top of file, and assign new build step)

Author: OCopping

Dockerfile

@@ -1,11 +1,19 @@
-# The devcontainer should use the developer target and run as root with podman
-# or docker with user namespaces.
+# Use this version of Python
 ARG PYTHON_VERSION=3.11
-FROM python:${PYTHON_VERSION} AS developer
-
 # Use this version of uv
 ARG UV_VERSION=0.7
 
 # Install uv using the official image
 # See https://docs.astral.sh/uv/guides/integration/docker/#installing-uv
-COPY --from=ghcr.io/astral-sh/uv:${UV_VERSION} /uv /uvx /bin/
+FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv-distroless
+
+# The devcontainer should use the developer target and run as root with podman
+# or docker with user namespaces.
+FROM python:${PYTHON_VERSION} AS developer
+
+# Add any system dependencies for the developer/build environment here
+# RUN apt-get update && apt-get install -y --no-install-recommends \
+#     graphviz
+
+# Install from uv image
+COPY --from=uv-distroless /uv /uvx /bin/

template/Dockerfile.jinja

@@ -1,22 +1,27 @@
-# The devcontainer should use the developer target and run as root with podman
-# or docker with user namespaces.
+# Use this version of Python
 ARG PYTHON_VERSION=3.11
-FROM python:${PYTHON_VERSION} AS developer
-
 # Use this version of uv
 ARG UV_VERSION=0.7
 
+# Install uv using the official image
+# See https://docs.astral.sh/uv/guides/integration/docker/#installing-uv
+FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv-distroless
+
+# The devcontainer should use the developer target and run as root with podman
+# or docker with user namespaces.
+FROM python:${PYTHON_VERSION} AS developer
+
 # Add any system dependencies for the developer/build environment here
 # RUN apt-get update && apt-get install -y --no-install-recommends \
 #     graphviz
 
-# Install uv using the official image
-# See https://docs.astral.sh/uv/guides/integration/docker/#installing-uv
-COPY --from=ghcr.io/astral-sh/uv:${UV_VERSION} /uv /uvx /bin/{% if docker %}
+# Install from uv image
+COPY --from=uv-distroless /uv /uvx /bin/{% if docker %}
 
 # The build stage installs the context into the venv
 FROM developer AS build
-COPY . /context
+# Copy only dependency files first
+COPY pyproject.toml uv.lock /context/
 WORKDIR /context
 
 # Enable bytecode compilation and copy from the cache instead of linking 
@@ -41,8 +46,8 @@ FROM python:${PYTHON_VERSION}-slim AS runtime
 # Add apt-get system dependecies for runtime here if needed
 
 # We need to keep the venv at the same absolute path as in the build stage
-COPY --from=build /context/venv/ /context/venv/
-ENV PATH=/context/venv/bin:$PATH
+COPY --from=build /context/.venv/ /context/.venv/
+ENV PATH=/context/.venv/bin:$PATH
 
 # Change this entrypoint if it is not the same as the repo
 ENTRYPOINT ["{{ repo_name }}"]