first pass on Dockerfile updates to uv

Author: ryanmerolle

.github/Dockerfile.ci

@@ -1,8 +1,8 @@
-# Dockerfile for CI/CD with Poetry and Python pre-installed
-FROM python:3.12-slim
+# Dockerfile for CI/CD with uv and Python pre-installed
+FROM ghcr.io/astral-sh/uv:python3.12-trixie
 
 LABEL org.opencontainers.image.source="https://github.com/OpenSecFlow/netdriver"
-LABEL org.opencontainers.image.description="CI/CD image with Python 3.12 and Poetry"
+LABEL org.opencontainers.image.description="CI/CD image with Python 3.12 and uv"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 
 # Install system dependencies
@@ -11,22 +11,10 @@ RUN apt-get update && apt-get install -y \
     curl \
     && rm -rf /var/lib/apt/lists/*
 
-# Install Poetry
-ENV POETRY_VERSION=1.8.3
-ENV POETRY_HOME=/opt/poetry
-ENV POETRY_NO_INTERACTION=1
-ENV POETRY_VIRTUALENVS_IN_PROJECT=false
-ENV POETRY_VIRTUALENVS_CREATE=true
-
-RUN curl -sSL https://install.python-poetry.org | python3 - \
-    && ln -s /opt/poetry/bin/poetry /usr/local/bin/poetry
-
-# Install Poetry plugins
-RUN poetry self add poetry-multiproject-plugin \
-    && poetry self add poetry-polylith-plugin
-
-# Verify installation
-RUN poetry --version && poetry self show plugins
+# Set uv environment variables
+ENV UV_PYTHON=python3.12
+ENV UV_COMPILE_BYTECODE=1
+ENV UV_LINK_MODE=copy
 
 WORKDIR /workspace
 

projects/agent/Dockerfile

@@ -1,39 +1,44 @@
 # Multi-stage build for netdriver-agent
-FROM ghcr.io/opensecflow/netdriver/python-poetry AS builder
+FROM ghcr.io/opensecflow/netdriver/python-uv AS builder
 
 LABEL org.opencontainers.image.source="https://github.com/OpenSecFlow/netdriver"
 LABEL org.opencontainers.image.description="NetDriver Agent - Network Device Automation REST API"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 
-# Poetry is already installed with plugins in the base image
-ENV POETRY_NO_INTERACTION=1
-ENV POETRY_VIRTUALENVS_IN_PROJECT=true
-ENV POETRY_VIRTUALENVS_CREATE=true
+# uv is already installed in the base image
+ENV UV_NO_PROGRESS=1
+ENV UV_PYTHON=python3.12
+ENV UV_COMPILE_BYTECODE=1
+ENV UV_LINK_MODE=copy
 
 WORKDIR /build
 
 # Copy project files
 COPY . .
 
-# Install dependencies and build
-RUN poetry install --only main --no-interaction --no-ansi \
-    && poetry build-project -C projects/agent
+# Build the wheel using uv
+RUN uv build --directory projects/agent --wheel
 
 # Final stage
-FROM python:3.12-slim
+FROM ghcr.io/astral-sh/uv:python3.12-trixie
 
 LABEL org.opencontainers.image.source="https://github.com/OpenSecFlow/netdriver"
 LABEL org.opencontainers.image.description="NetDriver Agent - Network Device Automation REST API"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 
+# Set uv environment variables for production
+ENV UV_COMPILE_BYTECODE=1
+ENV UV_LINK_MODE=copy
+ENV UV_PYTHON=python3.12
+
 # Create non-root user
 RUN useradd -m -u 1000 netdriver
 
 WORKDIR /app
 
-# Copy built wheel and install it
+# Copy built wheel and install it using uv
 COPY --from=builder /build/projects/agent/dist/*.whl /tmp/
-RUN pip install --no-cache-dir /tmp/*.whl \
+RUN uv pip install --system --no-cache /tmp/*.whl \
     && rm -rf /tmp/*.whl
 
 # Copy configuration files

projects/simunet/Dockerfile

@@ -1,39 +1,44 @@
 # Multi-stage build for netdriver-simunet
-FROM ghcr.io/opensecflow/netdriver/python-poetry AS builder
+FROM ghcr.io/opensecflow/netdriver/python-uv AS builder
 
 LABEL org.opencontainers.image.source="https://github.com/OpenSecFlow/netdriver"
 LABEL org.opencontainers.image.description="NetDriver Simunet - Simulated SSH Server for Network Devices"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 
-# Poetry is already installed with plugins in the base image
-ENV POETRY_NO_INTERACTION=1
-ENV POETRY_VIRTUALENVS_IN_PROJECT=true
-ENV POETRY_VIRTUALENVS_CREATE=true
+# uv is already installed in the base image
+ENV UV_NO_PROGRESS=1
+ENV UV_PYTHON=python3.12
+ENV UV_COMPILE_BYTECODE=1
+ENV UV_LINK_MODE=copy
 
 WORKDIR /build
 
 # Copy project files
 COPY . .
 
-# Install dependencies and build
-RUN poetry install --only main --no-interaction --no-ansi \
-    && poetry build-project -C projects/simunet
+# Build the wheel using uv
+RUN uv build --directory projects/simunet --wheel
 
 # Final stage
-FROM python:3.12-slim
+FROM ghcr.io/astral-sh/uv:python3.12-trixie
 
 LABEL org.opencontainers.image.source="https://github.com/OpenSecFlow/netdriver"
 LABEL org.opencontainers.image.description="NetDriver Simunet - Simulated SSH Server for Network Devices"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 
+# Set uv environment variables for production
+ENV UV_COMPILE_BYTECODE=1
+ENV UV_LINK_MODE=copy
+ENV UV_PYTHON=python3.12
+
 # Create non-root user
 RUN useradd -m -u 1000 netdriver
 
 WORKDIR /app
 
-# Copy built wheel and install it
+# Copy built wheel and install it using uv
 COPY --from=builder /build/projects/simunet/dist/*.whl /tmp/
-RUN pip install --no-cache-dir /tmp/*.whl \
+RUN uv pip install --system --no-cache /tmp/*.whl \
     && rm -rf /tmp/*.whl
 
 # Copy configuration files