Merge branch 'main' into docs/uat-runbook

Co-Authored-By: Paperclip <noreply@paperclip.ing>

receiptwitness/Dockerfile

@@ -3,9 +3,10 @@ FROM python:3.12-slim AS build
 
 WORKDIR /app
 
-# build-essential and libpq-dev are needed to compile any C-extension wheels
+# git is required to install cartsnitch-common from GitHub; build-essential and
-# (e.g. psycopg2 fallback).  git is no longer needed here.
+# libpq-dev are needed to compile any C-extension wheels (e.g. psycopg2 fallback)
 RUN apt-get update && apt-get install -y --no-install-recommends \
+    git \
     libpq-dev \
     build-essential \
     && rm -rf /var/lib/apt/lists/*
@@ -13,10 +14,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 COPY pyproject.toml ./
 COPY src/ ./src/
 
-# cartsnitch-common is not on PyPI — install it from the local monorepo common/
+# cartsnitch-common is not on PyPI — install it directly from GitHub, then
-# directory.  The common/ dir is the cartsnitch-common Python package.
+# install the rest of the package dependencies in a single resolver pass so
-COPY common/ /tmp/common/
+# pip can satisfy the cartsnitch-common>=0.1.0 constraint declared in
-RUN pip install --no-cache-dir --prefix=/install /tmp/common/ .
+# pyproject.toml without hitting PyPI for it.
+RUN pip install --no-cache-dir --prefix=/install \
+    "cartsnitch-common @ git+https://github.com/cartsnitch/common.git@76685ed0384103228cd670b477b967e7752ebe6b" \
+    .
 
 # Stage 2: Production image with Playwright + Chromium
 FROM python:3.12-slim AS prod