diff --git a/Dockerfile b/Dockerfile index da8583a13..2f7f8ffb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,6 +49,7 @@ WORKDIR /pi # matched path under /pi/ (requires syntax 1.7-labs). COPY --parents \ package.json bun.lock bunfig.toml \ + patches/*.patch \ tsconfig.base.json tsconfig.json \ Cargo.toml Cargo.lock rust-toolchain.toml \ packages/*/package.json \ @@ -169,6 +170,7 @@ WORKDIR /pi # only re-runs when a package.json / lockfile changes. COPY --parents \ package.json bun.lock bunfig.toml \ + patches/*.patch \ tsconfig.base.json tsconfig.json \ packages/*/package.json \ packages/tsconfig.workspace.json \ diff --git a/Dockerfile.robomp b/Dockerfile.robomp index f79fca4b9..b6444dee2 100644 --- a/Dockerfile.robomp +++ b/Dockerfile.robomp @@ -28,6 +28,9 @@ WORKDIR /work # --filter robomp-web` to hydrate just the dashboard's node_modules. COPY package.json bun.lock ./ COPY python/robomp/web/package.json ./python/robomp/web/package.json +# Root package.json declares patchedDependencies, so the patch file must be +# present before any root-level `bun install` (even a filtered one). +COPY patches/*.patch ./patches/ RUN bun install --filter robomp-web COPY --exclude=node_modules --exclude=dist python/robomp/web/ ./python/robomp/web/ RUN bun --cwd=python/robomp/web run build