diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 0fd5208..6856976 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -180,9 +180,10 @@ COPY --from=postgres-build /source/build/postgres/evo-server /usr/local/bin/evo- # M8.3 operations tool: check-store qualification, clone and history audit. COPY --from=postgres-build /source/build/postgres/evo-world-clone /usr/local/bin/evo-world-clone COPY --from=postgres-build /source/.cache/postgres/install/lib/libpq.so* /opt/postgres/lib/ +COPY --from=postgres-build /source/build/postgres/msquic/bin/Release/libmsquic.so* /opt/msquic/lib/ COPY --from=postgres-build /source/.cache/postgres/postgresql-18.6/COPYRIGHT /usr/share/doc/evo-postgres/COPYRIGHT RUN chmod 1777 /tmp -ENV LD_LIBRARY_PATH=/opt/postgres/lib +ENV LD_LIBRARY_PATH=/opt/postgres/lib:/opt/msquic/lib USER 10001:10001 WORKDIR /tmp EXPOSE 9100 diff --git a/docs/adr/0066-operations-endpoints.md b/docs/adr/0066-operations-endpoints.md index fd1fe5e..c320c9e 100644 --- a/docs/adr/0066-operations-endpoints.md +++ b/docs/adr/0066-operations-endpoints.md @@ -49,9 +49,10 @@ each from a fixed enum. There are no world, region, entity or request labels: the scrape target carries region identity. The exposition is about 3.5 KB and at most 8 KiB. Commit lag saturates at zero rather than wrapping. -**Image** (`server-runtime` Docker target) contains `evo-server` and the pinned -libpq, and installs only the runtime libraries it needs (libstdc++, libssl3, -zlib, CA certificates): +**Image** (`server-runtime` Docker target) contains `evo-server`, +`evo-world-clone`, the pinned libpq, and the matching pinned MsQuic shared library +when built with the QUIC listener enabled. It installs only the runtime libraries +it needs (libstdc++, libssl3, zlib, CA certificates): - It runs as UID/GID 10001 with a read-only root filesystem and all capabilities dropped. It exposes port 9100 and has no default configuration. - With missing settings it exits 2 with usage; there is no default region, diff --git a/tools/ci/server-image-smoke.sh b/tools/ci/server-image-smoke.sh index 3aa3479..f4a22b2 100644 --- a/tools/ci/server-image-smoke.sh +++ b/tools/ci/server-image-smoke.sh @@ -13,15 +13,19 @@ set +e usage="$(run "$image" 2>&1)" code=$? set -e -test "$code" -eq 2 -grep -q '^usage: evo-server ' <<<"$usage" +if [[ "$code" -ne 2 ]] || ! grep -q '^usage: evo-server ' <<<"$usage"; then + printf 'evo-server smoke failed (exit %s):\n%s\n' "$code" "$usage" >&2 + exit 1 +fi # The bundled operations tool refuses to run without a subcommand too (M8.3). set +e tool="$(run --entrypoint /usr/local/bin/evo-world-clone "$image" 2>&1)" code=$? set -e -test "$code" -eq 2 -grep -q '^usage: evo-world-clone ' <<<"$tool" +if [[ "$code" -ne 2 ]] || ! grep -q '^usage: evo-world-clone ' <<<"$tool"; then + printf 'evo-world-clone smoke failed (exit %s):\n%s\n' "$code" "$tool" >&2 + exit 1 +fi # Non-root, every shared library resolved, no credential material in the image. run --entrypoint /bin/sh "$image" -c ' set -eu