Fix server, web app to reuse prebuilt deps on dev container setup

This commit is contained in:
Debanjum
2025-08-01 18:31:25 -07:00
parent 0a0b97446c
commit 80cce7b439
2 changed files with 25 additions and 29 deletions

View File

@@ -2,16 +2,19 @@ ARG PYTHON_VERSION=3.12
FROM mcr.microsoft.com/devcontainers/python:${PYTHON_VERSION}
# Install UV and Bun
RUN curl -fsSL https://bun.sh/install | bash
RUN curl -fsSL https://bun.sh/install | bash && mv /root/.bun/bin/bun /usr/local/bin/bun
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
RUN uv python pin $PYTHON_VERSION
# create python virtual environment
RUN uv venv /opt/venv --python $PYTHON_VERSION --seed
# Add venv, deno to PATH for subsequent RUN commands and for the container environment
ENV PATH="/opt/venv/bin:/root/.bun/bin:$PATH"
# Add venv to PATH for subsequent RUN commands and for the container environment
ENV PATH="/opt/venv/bin:$PATH"
# Tell pip, uv to use this virtual environment
ENV VIRTUAL_ENV="/opt/venv"
ENV UV_PROJECT_ENVIRONMENT="/opt/venv"
# Setup working directory
WORKDIR /workspace
WORKDIR /workspaces/khoj
# --- Python Server App Dependencies ---
# Copy files required for Python dependency installation.
@@ -19,22 +22,28 @@ COPY pyproject.toml README.md ./
# Setup python environment
# Use the pre-built torch cpu wheel
ENV PIP_EXTRA_INDEX_URL="https://download.pytorch.org/whl/cpu" \
ENV UV_INDEX="https://download.pytorch.org/whl/cpu" \
UV_INDEX_STRATEGY="unsafe-best-match" \
# Avoid downloading unused cuda specific python packages
CUDA_VISIBLE_DEVICES="" \
# Use static version to build app without git dependency
VERSION=0.0.0
VERSION=0.0.0 \
# Use embedded db
USE_EMBEDDED_DB="True" \
PGSERVER_DATA_DIR="/opt/khoj_db"
# Install Python dependencies from pyproject.toml in editable mode
RUN sed -i "s/dynamic = \\[\"version\"\\]/version = \"$VERSION\"/" pyproject.toml && \
uv sync --all-extras && \
# Save the lock file generated with correct Linux platform wheels
cp uv.lock /opt/uv.lock.linux && \
chown -R vscode:vscode /opt/venv
# --- Web App Dependencies ---
# Copy web app manifest files
COPY src/interface/web/package.json src/interface/web/bun.lock /tmp/web/
COPY src/interface/web/package.json src/interface/web/bun.lock /opt/khoj_web/
# Install web app dependencies
RUN cd /tmp/web && bun install
RUN cd /opt/khoj_web && bun install && chown -R vscode:vscode .
# The .venv and node_modules are now populated in the image.
# The rest of the source code will be mounted by VS Code from your local checkout,