deploy: DiamondLightSource/python-copier-template@7659ef5

Author: coretl

.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 5.0.0a1-3-g32c6c7b
+_commit: 5.0.0a1-4-g7659ef5
 _src_path: https://github.com/DiamondLightSource/python-copier-template.git
 author_email: tom.cobb@diamond.ac.uk
 author_name: Tom Cobb

.devcontainer/devcontainer.json

@@ -8,8 +8,6 @@
     "remoteEnv": {
         // Allow X11 apps to run inside the container
         "DISPLAY": "${localEnv:DISPLAY}",
-        // We put venv on a different volume to cache so have to copy
-        "UV_LINK_MODE": "copy",
         // Do the equivalent of "activate" the venv so we don't have to "uv run" everything
         "PATH": "/workspaces/${localWorkspaceFolderBasename}/.venv/bin:${containerEnv:PATH}"
     },

Dockerfile

@@ -3,7 +3,7 @@
 FROM ghcr.io/diamondlightsource/ubuntu-devcontainer:noble AS developer
 
 # Add any system dependencies for the developer/build environment here
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
     graphviz \
     && apt-get dist-clean
 
@@ -16,6 +16,9 @@ WORKDIR /app
 COPY . /app
 RUN chmod o+wrX .
 
+# Tell uv sync to install python in a known location so we can copy it out later
+ENV UV_PYTHON_INSTALL_DIR=/python
+
 # Sync the project without its dev dependencies
 RUN --mount=type=cache,target=/root/.cache/uv \
     uv sync --locked --no-editable --no-dev
@@ -36,6 +39,7 @@ RUN sed -i 's/files/ldap files/g' /etc/nsswitch.conf
 # Make editable and debuggable
 RUN uv pip install debugpy
 RUN uv pip install -e .
+ENV PATH=/app/.venv/bin:$PATH
 
 # Alternate entrypoint to allow devcontainer to attach
 ENTRYPOINT [ "/bin/bash", "-c", "--" ]
@@ -46,10 +50,13 @@ CMD [ "while true; do sleep 30; done;" ]
 FROM ubuntu:noble AS runtime
 
 # Add apt-get system dependecies for runtime here if needed
-# RUN apt-get update && apt-get install -y --no-install-recommends \
+# RUN apt-get update -y && apt-get install -y --no-install-recommends \
 #     some-library \
 #     && apt-get dist-clean
 
+# Copy the python installation from the build stage
+COPY --from=build /python /python
+
 # Copy the environment, but not the source code
 COPY --from=build /app/.venv /app/.venv
 ENV PATH=/app/.venv/bin:$PATH