diff --git a/.github/workflows/docs-site.yml b/.github/workflows/docs-site.yml index d615ee4..fb52fb5 100644 --- a/.github/workflows/docs-site.yml +++ b/.github/workflows/docs-site.yml @@ -1,10 +1,7 @@ name: Docs site # docs/** is deliberately broad — it also covers docs/releases/* changes so -# the site rebuilds when release notes change once docs-site/ exists. That -# means this can trigger before docs-site/ is bootstrapped, so the job -# itself is guarded below (docs-site/package.json must exist) — see -# docs/docs-site.md. +# the site rebuilds when release notes change. See docs/docs-site.md. on: push: branches: [main] @@ -18,7 +15,6 @@ permissions: jobs: build-deploy: name: Build & deploy docs - if: ${{ hashFiles('docs-site/package.json') != '' }} runs-on: ubuntu-latest defaults: run: diff --git a/spoolbook-rs/Dockerfile b/spoolbook-rs/Dockerfile index 3a3afb8..fcde93c 100644 --- a/spoolbook-rs/Dockerfile +++ b/spoolbook-rs/Dockerfile @@ -19,7 +19,11 @@ COPY spoolbook-rs/ ./ RUN cargo build --release FROM debian:trixie-slim -RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates libcurl4t64 && rm -rf /var/lib/apt/lists/* +# ffmpeg: printer_camera.rs shells out to it for the live-camera MJPEG relay -- without it the +# camera feed fails with a generic "Camera stream failed" on every Docker install (works in dev +# only because macOS has ffmpeg on PATH). Pulls ~150MB of libav* deps; a static ffmpeg build +# would shrink that if image size ever matters. +RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates libcurl4t64 ffmpeg && rm -rf /var/lib/apt/lists/* WORKDIR /app COPY --from=backend-build /src/target/release/spoolbook-rs . COPY --from=frontend-build /src/spoolbook-web-svelte/build ./svelte-build