Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/+aurora-addon-dockerfile-package-json.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Copy the frontend's own `package.json` into the image as-is in the Aurora add-on and project Dockerfiles, instead of merging its dependencies into the `plone/aurora-builder` one, so it matches the frontend's `pnpm-lock.yaml`. @sneridagh
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ COPY --chown=node registry.config.ts /app/
COPY --chown=node Makefile /app/Makefile
COPY --chown=node pnpm-workspace.yaml /app/pnpm-workspace.yaml
COPY --chown=node .pnpmfile.cjs /app/.pnpmfile.cjs
COPY --chown=node package.json /app/package.json.temp
COPY --chown=node package.json /app/package.json
COPY --chown=node pnpm-lock.yaml /app/pnpm-lock.yaml

RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
set -e
python3 -c "import json; orig_data = json.load(open('package.json.temp')); orig_deps = orig_data['dependencies']; data = json.load(open('package.json')); data['dependencies'].update(orig_deps); json.dump(data, open('package.json', 'w'), indent=2)"
rm package.json.temp
pnpm install && make build-deps
pnpm build
# This is necessary because the build is trying to recreate the node_modules folder
Expand Down
Loading