Mount venv in workspace

Author: tpoliaw

.devcontainer/devcontainer.json

@@ -11,7 +11,7 @@
     },
     "remoteEnv": {
         // Allow X11 apps to run inside the container
-        "DISPLAY": "${localEnv:DISPLAY}"
+        "DISPLAY": "${localEnv:DISPLAY}",
     },
     "customizations": {
         "vscode": {
@@ -38,14 +38,18 @@
             "source": "${localEnv:HOME}/.cache/uv",
             "target": "/.cache/uv",
             "type": "bind"
+        },
+        {
+            "target": "/workspaces/blueapi/.venv",
+            "type": "volume"
         }
     ],
     "features": {
         // add in eternal history and other bash features
         "ghcr.io/diamondlightsource/devcontainer-features/bash-config:1": {}
     },
     // Create the config folder for the bash-config feature
-    "initializeCommand": "mkdir -p ${localEnv:HOME}/.config/bash-config",
+    "initializeCommand": "mkdir -p ${localEnv:HOME}/.config/bash-config ${localEnv:HOME}/.cache/uv",
     "runArgs": [
         // Allow the container to access the host X11 display and EPICS CA
         "--net=host",

Dockerfile

@@ -2,8 +2,7 @@
 # or docker with user namespaces.
 # Version SHA has been removed, see: https://github.com/DiamondLightSource/blueapi/issues/1053
 ARG PYTHON_VERSION=3.11
-FROM python:${PYTHON_VERSION} AS developer
-COPY --from=ghcr.io/astral-sh/uv:0.7.17 /uv /uvx /bin/
+FROM ghcr.io/astral-sh/uv:0.7.19-bookworm AS developer
 
 # Add any system dependencies for the developer/build environment here
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -17,23 +16,16 @@ RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/s
     ./get_helm.sh; \
     rm get_helm.sh
 
-# Set up a virtual environment and put it in PATH
-# TODO: uv setup env
-ENV UV_PROJECT_ENVIRONMENT=/venv
-# TODO: uv cache
 RUN mkdir -p /.cache/uv; chmod 777 /.cache/uv
 ENV UV_CACHE_DIR=/.cache/uv
-# RUN python -m venv /venv
-# ENV PATH=/venv/bin:$PATH
+RUN SHELL=/usr/bin/bash uv tool update-shell
 
 # The build stage installs the context into the venv
 FROM developer AS build
-# RUN mkdir -p /.cache/pip; chmod 777 /.cache/pip
+
 COPY --chmod=777 . /workspaces/blueapi
 WORKDIR /workspaces/blueapi
-# TODO: uv sync
 RUN uv sync --locked
-# RUN touch dev-requirements.txt && pip install --upgrade pip && pip install -c dev-requirements.txt .
 
 FROM build AS debug
 
@@ -46,11 +38,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt install libnss-ldapd -y
 RUN sed -i 's/files/ldap files/g' /etc/nsswitch.conf
 
 # Make editable and debuggable
-# TODO: uv tool install debugpy
 RUN uv tool install debugpy
 RUN uv tool install --editable .
-# RUN pip install debugpy
-# RUN pip install -e .
 
 # Alternate entrypoint to allow devcontainer to attach
 ENTRYPOINT [ "/bin/bash", "-c", "--" ]
@@ -63,11 +52,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     # Git required for installing packages at runtime
     git \
     && rm -rf /var/lib/apt/lists/*
-# TODO: Update cache locations
-COPY --from=build --chmod=777 /venv/ /venv/
 COPY --from=build --chmod=777 /.cache/uv /.cache/uv
 COPY --from=build --chmod=777 /workspaces/blueapi /workspaces/blueapi
-ENV PATH=/venv/bin:$PATH
+ENV PATH=/workspaces/blueapi/.venv/bin:$PATH
 ENV UV_CACHE_DIR=/.cache/uv
 ENV PYTHONPYCACHEPREFIX=/tmp/blueapi_pycache