Merge pull request 'M1.5 accepted: tests over a published image' (#118) from image-accept into main

Dockerfile

@@ -10,6 +10,12 @@
 #   docker build -t nisse-dev .                  the agent
 #   docker build --target test -t nisse-dev:test .   plus the tests, for
 #                                                   scripts/e2e.sh --image
+#   docker build --target test --build-arg TEST_BASE=<published image> \
+#       -t nisse-dev:test .                      the tests over a release as
+#                                                published (M1.5 acceptance)
+
+# What the test stage stacks on: this build's agent, or a published image.
+ARG TEST_BASE=runtime
 
 FROM python:3.12-slim AS build
 COPY --from=ghcr.io/astral-sh/uv:0.12.10 /uv /usr/local/bin/uv
@@ -40,9 +46,10 @@ VOLUME /var/lib/nisse-dev
 USER nisse
 ENTRYPOINT ["nisse-dev"]
 
-# The image's own package plus the tests, so the end-to-end suite runs
+# The tests over an image's own package (this build's, or a published one,
-# against what was built, not the source tree.
+# TEST_BASE): only the test tools are added, never the agent reinstalled, so
-FROM runtime AS test
+# the end-to-end suite runs against what was built, not the source beside it.
+FROM ${TEST_BASE} AS test
 USER root
 RUN apt-get update \
     && apt-get install -y --no-install-recommends git openssh-server \
@@ -57,11 +64,9 @@ COPY nisse-ops nisse-ops
 COPY tests tests
 COPY scripts scripts
 COPY conftest.py ./
-ENV UV_PROJECT_ENVIRONMENT=/opt/nisse
+ENV UV_PROJECT_ENVIRONMENT=/opt/nisse UV_NO_SYNC=1
-# Test tools too, all installed (not editable), and `uv run` never re-syncs:
+RUN uv export --frozen --only-group dev --no-hashes --no-emit-project > /tmp/dev.txt \
-# the tests import the package as built, not the source tree beside them.
+    && uv pip install --quiet --python /opt/nisse/bin/python -r /tmp/dev.txt
-RUN uv sync --frozen --all-packages --no-editable --inexact
-ENV UV_NO_SYNC=1
 ENTRYPOINT []
 
 # The default target: the agent itself.

docs/Development-Plan.md

@@ -275,8 +275,9 @@ in prose, asking mid-work (L5, #42, #77).
 - Deferred: config reload without a restart (with M2.5's entry step if wanted);
   the trust dial's configuration (M3.3).
 
-**M1.5 The agent as a container image.** *Pre-approved.* **Built** (this PR);
+**M1.5 The agent as a container image.** *Pre-approved.* **Done** (#115; accepted
-accepted once a tag's image passes the e2e suite.
+2026-10-07: `v0.1.0`'s published image passed the whole e2e suite, 9 of 9, run with
+the release's own tests over it).
 - A Dockerfile for `nisse-dev`, stateless with a volume for state; a Gitea Actions
   workflow that builds it and pushes to Gitea's registry on each release tag (X4).
 - `bringup.sh` runs the image instead of a venv.
@@ -287,6 +288,10 @@ accepted once a tag's image passes the e2e suite.
   package, for `scripts/e2e.sh --image REF`. Images are built only on release:
   `release.yml` pushes `gitea.dongar.net/dev/nisse-dev:<version>` and `:latest`
   on a published release (`REGISTRY_TOKEN`, the `dev` organization's).
+- Acceptance runs the tests over a published image: `docker build --target test
+  --build-arg TEST_BASE=gitea.dongar.net/dev/nisse-dev:<version>` from the
+  release's checkout, then `scripts/e2e.sh --image`; the test stage adds only the
+  test tools, so the agent under test is the one published.
 - The live bring-up's switch to the image waits for the next live test (it needs
   its own test repository too); `bringup.sh plan` shows what it will run.
 

scripts/e2e.sh

@@ -23,6 +23,8 @@ if [ "${1:-}" = "--image" ]; then
     mkdir -p "$runs"
     secrets=()
     [ -f .env ] && secrets=(--env-file .env)
+    # The model, if overridden here, reaches the tests inside too.
+    [ -n "${NISSE_E2E_MODEL:-}" ] && secrets+=(-e "NISSE_E2E_MODEL=$NISSE_E2E_MODEL")
     # Host networking: the suite reaches Matrix, Gitea and LiteLLM as here.
     exec docker run --rm --network host "${secrets[@]}" \
         -e NISSE_E2E_RUNS=/runs -v "$runs:/runs" \