use uv in dockerfiles

Author: willcl-ark

.github/actions/compose/action.yml

@@ -14,7 +14,3 @@ runs:
         sudo apt-get update
         sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
       shell: bash
-    - run: pip install --upgrade pip
-      shell: bash
-    - run: pip install -e .
-      shell: bash

.github/actions/k8s/action.yml

@@ -17,13 +17,10 @@ runs:
         docker image ls -a
 
         echo Installing warnet python package for cli
-        pip install --upgrade pip
-        pip install -e .
+        uv pip install --system --no-cache -r requirements.txt
+        uv pip install --system --no-cache -e .
 
-        echo patching k8s configs to use local image
-        echo Patching warnet-rpc-statefulset-dev to use local registry
-        sed -i "s|imagePullPolicy: Always|imagePullPolicy: Never|g" src/templates/rpc/warnet-rpc-statefulset-dev.yaml
-        sed -i "s|bitcoindevproject/warnet-rpc:dev|local/warnet-rpc:ci|g" src/templates/rpc/warnet-rpc-statefulset-dev.yaml
+        echo "Using warnet-rpc-statefulset-dev.yaml:"
         cat src/templates/rpc/warnet-rpc-statefulset-dev.yaml
 
         echo Setting up k8s

.github/workflows/test.yml

@@ -46,6 +46,7 @@ jobs:
         test: [scenarios_test.py, rpc_test.py, graph_test.py, ln_test.py, get_service_ip_test.py]
     steps:
       - uses: actions/checkout@v4
+      - uses: hynek/setup-cached-uv@v1
       - if: matrix.backend == 'compose'
         uses: ./.github/actions/compose
       - if: matrix.backend == 'k8s'
@@ -54,11 +55,18 @@ jobs:
         run: |
           kubectl port-forward svc/rpc 9276:9276 &
       - name: Run tests
-        run: ./test/${{matrix.test}} ${{matrix.backend}}
+        run: |
+          uv venv
+          uv pip install .
+          uv test/${{matrix.test}} ${{matrix.backend}}
   build-test:
     needs: [build-image]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: hynek/setup-cached-uv@v1
       - uses: ./.github/actions/compose
-      - run: ./test/build_branch_test.py compose
+      - run: |
+          uv venv
+          uv pip install .
+          uv run test/build_branch_test.py compose

src/templates/rpc/Dockerfile_rpc

@@ -1,17 +1,25 @@
 # Use an official Python runtime as the base image
-FROM python:3.11-slim
+FROM python:3.12-slim
 
 # Install procps, which includes pgrep
 RUN apt-get update && \
     apt-get install -y procps openssh-client && \
     rm -rf /var/lib/apt/lists/*
 
+# Install `uv` packge installer (https://github.com/astral-sh/uv)
+RUN pip install uv
+
 # Set the working directory in the container
 WORKDIR /root/warnet
 
+# Get better caching by installing before copying code
+COPY requirements.txt .
+RUN uv pip install --system -r requirements.txt
+
 # Copy the source directory contents into the container
 COPY . /root/warnet
-RUN pip install .
+# Install Warnet scripts
+RUN uv pip install --system .
 
 # Make port 9276 available to the world outside this container
 # Change the port if your server is running on a different port

src/templates/rpc/Dockerfile_rpc_dev

@@ -1,11 +1,14 @@
 # Use an official Python runtime as the base image
-FROM python:3.11-slim
+FROM python:3.12-slim
 
 # Install procps, which includes pgrep
 RUN apt-get update && \
     apt-get install -y procps openssh-client && \
     rm -rf /var/lib/apt/lists/*
 
+# Install `uv` packge installer (https://github.com/astral-sh/uv)
+RUN pip install uv
+
 # Set the working directory in the container
 WORKDIR /root/warnet
 

src/templates/rpc/entrypoint.sh

@@ -31,7 +31,7 @@ done
 if check_setup_toml; then
     echo "Installing package from ${SOURCE_DIR}..."
     cd ${SOURCE_DIR}
-    pip install -e .
+    uv pip install --system -e .
 fi
 
 # Execute the CMD from the Dockerfile