Round 9 found no blocker and no HIGH. These are its mechanical findings, plus one
correction to the fix it proposed.
The proposed fix for its MEDIUM did NOT work, and I measured it rather than
taking it. Round 9 suggested two assertions to pin the population WIRING —
`TRACKED_SOURCE_PATHS` equals `trackedSources.tracked`, and `listSourceFiles()`
equals `listSourceFilesFrom(rawSourceModules, TRACKED_SOURCE_PATHS)` — reported
as reddening the two survivors. Written and measured: both mutations stayed green
with those assertions in place (44/44). The reason is structural. On a clean
checkout the walk set and the index set ARE the same set — every tracked file is
on disk, nothing untracked exists — so no comparison between the two populations
can tell which one is wired in. It is observable only on a tree that HAS an
untracked source file, which is precisely the tree CI never checks out.
So it is recorded as residual (4) with its measurement and its DIRECTION, rather
than papered over with an assertion that cannot fail. Direction is what makes it
a residual and not a defect: reverting the wiring is fail-NOISY — it reddens a
developer's checkout that has a scratch file, the original #819 complaint — and
cannot hide a call site from the registry. Every blind direction runs through the
population SOURCE, and those are pinned by the cross-check.
Also from round 9:
- The checkout-vs-binary distinction was stated as an either/or in
`docs/testing.md` and the Dockerfile. MEASURED: with `.git` PRESENT and git off
`PATH`, the guard still fails — it needs both. As written it would license a
future "just `COPY .git` and re-enable it", which is round 8's blocker in
reverse. Both now say so explicitly.
- `docs/guard-inventory.md` claimed the partition residual is "checked only by
the plugin's own real-git tests". They catch an unconditional mispartition, not
one keyed on a path pattern. Corrected, and the wiring residual added beside it.
- The file split left two comments pointing at the file the real-git tests are no
longer in, and one saying "every test above" where there is now nothing above.
- A drifting "1259 tests" figure — the class this PR already swept out once.
- The TS/C#-guards scope item had grown into "A, B and C and D and its sibling"
across four over-long lines; rewritten as a four-item list.
Rebased onto b6b3520bd (#874).
Refs: #819
139 lines
7.6 KiB
Docker
139 lines
7.6 KiB
Docker
FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble-amd64 AS dotnet-runtime
|
|
|
|
FROM node:22-bookworm-slim AS web-build
|
|
WORKDIR /source
|
|
COPY web/package*.json ./web/
|
|
WORKDIR /source/web
|
|
RUN npm ci
|
|
WORKDIR /source
|
|
COPY design-system/. ./design-system/
|
|
COPY web/. ./web/
|
|
WORKDIR /source/web
|
|
# The SPA suite runs here except for two files (ersatztv#819), and the two are excluded for
|
|
# DIFFERENT reasons — the distinction is the one that broke this stage once already:
|
|
# * `web/src/api/pageSizeCallSites.guard.test.ts` needs a git CHECKOUT — and, through it, the
|
|
# binary. It derives its file population from `git ls-files` rather than a directory walk, and
|
|
# refuses rather than falling back. This stage's context is `web/` + `design-system/` only, so
|
|
# there is no `.git`.
|
|
# * `web/vite-plugins/trackedSourceFiles.realgit.test.ts` needs the BINARY but no checkout: it
|
|
# builds its own temp repository to prove the derivation by executing it.
|
|
# `node:22-bookworm-slim` ships no git (`command -v git` -> not found), so it dies with
|
|
# `spawnSync git ENOENT`.
|
|
# So this is NOT checkout-versus-binary, and adding a `COPY .git` would not let either run here —
|
|
# the binary would still be missing. Excluding only the first is not enough either, and a replica
|
|
# that merely deletes `.git` cannot show that: verify any change here with the git binary off
|
|
# `PATH`, not just with the directory absent.
|
|
# Everything else — all but those two files — runs fine gitless and is kept, rather than dropping
|
|
# the whole suite for one file as an earlier fix here did.
|
|
# The excluded pair is not skipped overall: `docker-build.yml`'s `Build & test (.NET)` job runs the
|
|
# whole suite on a real checkout, and `build` (the job that invokes this Dockerfile) carries
|
|
# `needs: [test, migrations, scan]`. State that chain precisely, because the `needs:` edge is not
|
|
# all of it: `Test SPA` is also gated on `docs_only` and on the #420 revalidate skip, and `build` is
|
|
# not gated on `revalidate`. On a push whose tree is byte-identical to an already-green head the
|
|
# suite is skipped and the image still builds — carried there by #420's byte-identical-tree
|
|
# argument. The `docs_only` arm cannot ship an image at all (`Build and push` is gated on it too),
|
|
# and `ci-detect-docs-only.sh` classifies by PATH SHAPE (`docs/` or `*.md`), not by directory, so a
|
|
# `web/*.md` would count as docs — there are none today, but do not restate it as "any `web/**`".
|
|
RUN npm run lint && npm run typecheck && \
|
|
npm test -- --run \
|
|
--exclude 'src/api/pageSizeCallSites.guard.test.ts' \
|
|
--exclude 'vite-plugins/trackedSourceFiles.realgit.test.ts' && \
|
|
npm run build
|
|
|
|
FROM --platform=linux/amd64 192.168.1.95:3000/timothy/ersatztv-ffmpeg:8.1.2 AS runtime-base
|
|
COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet
|
|
RUN apt-get update && \
|
|
apt-get install -y --no-install-recommends python3 python3-pip && \
|
|
python3 -m pip install --target=/app/pythonlibs --no-cache-dir streamlink && \
|
|
apt-get clean -y && \
|
|
rm -rf /var/lib/apt/lists/*
|
|
|
|
# https://hub.docker.com/_/microsoft-dotnet
|
|
FROM mcr.microsoft.com/dotnet/sdk:10.0-noble-amd64 AS build
|
|
RUN apt-get update && apt-get install -y ca-certificates gnupg default-jre-headless python3-pip
|
|
WORKDIR /source
|
|
|
|
# download the openapi-generator jar first so this layer is cached independently
|
|
# of the openapi spec dir below -- otherwise every spec change (e.g. v1.json)
|
|
# busts the layer and re-downloads the ~30MB jar (ersatztv#190)
|
|
RUN wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.15.0/openapi-generator-cli-7.15.0.jar
|
|
|
|
# generate openapi client
|
|
COPY ErsatzTV/wwwroot/openapi/. /app/ErsatzTV/wwwroot/openapi/
|
|
RUN java -jar openapi-generator-cli-7.15.0.jar generate -i /app/ErsatzTV/wwwroot/openapi/scripted-schedule.json -g python -o /app/etv-client --package-name etv_client
|
|
RUN rm -rf openapi-generator-cli-7.15.0.jar /app/ErsatzTV
|
|
RUN python3 -m pip install --target=/app/pythonlibs /app/etv-client
|
|
RUN rm -rf /app/etv-client
|
|
COPY scripts/scripted-schedules/. /app/scripted-schedules/
|
|
|
|
# copy csproj and restore as distinct layers
|
|
COPY *.sln .
|
|
# repo-wide build config (MSBuild props/targets incl. NuGet-audit warning
|
|
# exemptions, SDK pin, analyzer severities, and the Central Package Management
|
|
# version manifest) must be present before restore so the image build matches
|
|
# local/CI builds. Directory.Packages.props is REQUIRED here: with CPM the csproj
|
|
# carry no versions, so restore fails without the central manifest.
|
|
COPY Directory.Build.props Directory.Build.targets Directory.Packages.props global.json .editorconfig ./
|
|
COPY eng/analyzers/sdk-all-suggestion.globalconfig ./eng/analyzers/
|
|
COPY artwork/* ./artwork/
|
|
COPY ErsatzTV/*.csproj ./ErsatzTV/
|
|
COPY ErsatzTV.Application/*.csproj ./ErsatzTV.Application/
|
|
COPY ErsatzTV.Core/*.csproj ./ErsatzTV.Core/
|
|
COPY ErsatzTV.Core.Nullable/*.csproj ./ErsatzTV.Core.Nullable/
|
|
COPY ErsatzTV.FFmpeg/*.csproj ./ErsatzTV.FFmpeg/
|
|
COPY ErsatzTV.Infrastructure/*.csproj ./ErsatzTV.Infrastructure/
|
|
COPY ErsatzTV.Infrastructure.Sqlite/*.csproj ./ErsatzTV.Infrastructure.Sqlite/
|
|
COPY ErsatzTV.Infrastructure.MySql/*.csproj ./ErsatzTV.Infrastructure.MySql/
|
|
COPY ErsatzTV.Scanner/*.csproj ./ErsatzTV.Scanner/
|
|
|
|
# Disable the persistent Roslyn/MSBuild compiler servers for the in-image build (ersatztv#406,
|
|
# server-management#604). The workflow sets these as env for the runner-side dotnet jobs, but this
|
|
# stage compiles inside `docker build`, so the workflow's env does NOT reach it — the restore and
|
|
# the two publishes below would otherwise spin up their own VBCSCompiler and hold its heap. This is
|
|
# the `build` job that server-management#570 measured pegging 5.999/6 GiB, so it is the one that
|
|
# most needs this.
|
|
#
|
|
# Placed here rather than at the top of the stage on purpose: an ENV invalidates every layer below
|
|
# it, and the wget of the ~30MB openapi-generator jar above is deliberately ordered early to stay
|
|
# cached (ersatztv#190). Nothing between that wget and this line compiles, so this is the earliest
|
|
# point where the ENV is free.
|
|
#
|
|
# Build-stage only: the final image is FROM runtime-base and only COPY --from=build /app (files,
|
|
# not ENV), so none of this lands in the shipped image or affects runtime.
|
|
ENV UseSharedCompilation=false \
|
|
DOTNET_CLI_USE_MSBUILD_SERVER=0 \
|
|
MSBUILDDISABLENODEREUSE=1
|
|
|
|
RUN dotnet restore -r linux-x64 ErsatzTV/ErsatzTV.csproj
|
|
|
|
# copy everything else and build app
|
|
COPY ErsatzTV/. ./ErsatzTV/
|
|
COPY --from=web-build /source/ErsatzTV/wwwroot/app/. ./ErsatzTV/wwwroot/app/
|
|
COPY ErsatzTV.Application/. ./ErsatzTV.Application/
|
|
COPY ErsatzTV.Core/. ./ErsatzTV.Core/
|
|
COPY ErsatzTV.Core.Nullable/. ./ErsatzTV.Core.Nullable/
|
|
COPY ErsatzTV.FFmpeg/. ./ErsatzTV.FFmpeg/
|
|
COPY ErsatzTV.Infrastructure/. ./ErsatzTV.Infrastructure/
|
|
COPY ErsatzTV.Infrastructure.Sqlite/. ./ErsatzTV.Infrastructure.Sqlite/
|
|
COPY ErsatzTV.Infrastructure.MySql/. ./ErsatzTV.Infrastructure.MySql/
|
|
COPY ErsatzTV.Scanner/. ./ErsatzTV.Scanner/
|
|
ARG INFO_VERSION="unknown"
|
|
ARG BUILD_CONFIG="release"
|
|
WORKDIR /source/ErsatzTV.Scanner
|
|
RUN dotnet publish ErsatzTV.Scanner.csproj -c ${BUILD_CONFIG} -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION}
|
|
WORKDIR /source/ErsatzTV
|
|
RUN sed -i '/Scanner/d' ErsatzTV.csproj
|
|
RUN dotnet publish ErsatzTV.csproj -c ${BUILD_CONFIG} -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION}
|
|
|
|
# final stage/image
|
|
FROM runtime-base
|
|
ENV FONTCONFIG_PATH=/etc/fonts
|
|
RUN fc-cache update
|
|
WORKDIR /app
|
|
COPY --from=build /app ./
|
|
ENV PYTHONPATH=/app/pythonlibs
|
|
ENV ETV_CONFIG_FOLDER=/config
|
|
ENV ETV_TRANSCODE_FOLDER=/transcode
|
|
ENV ETV_DISABLE_VULKAN=1
|
|
ENTRYPOINT ["./ErsatzTV"]
|