Skip to content

Commit

Permalink
Merge branch 'fix-docker-build' into 'main'
Browse files Browse the repository at this point in the history
Fix frontend build in docker

See merge request reportcreator/reportcreator!758
  • Loading branch information
MWedl committed Nov 12, 2024
2 parents 65ffd31 + 637d3bb commit 5c8e4e2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ COPY api/src/reportcreator_api/tasks/rendering/global_assets /app/packages/front
COPY --from=pdfviewer /app/packages/pdfviewer/dist/ /app/packages/frontend/src/public/static/pdfviewer/dist/
# Test command
WORKDIR /app/packages/frontend/
CMD npm run test
CMD ["npm", "run", "test"]


FROM --platform=$BUILDPLATFORM frontend-test AS frontend
# Build JS bundle
RUN npm run generate
RUN npm run postinstall && npm run generate



Expand Down
13 changes: 11 additions & 2 deletions plugins/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,16 @@ function build_plugin() {

for plugin in *; do
if [[ -d "$plugin" ]]; then
build_plugin "$plugin" "$action" &
if [ $action == "dev" ]; then
# Start plugins in dev mode in parallel
build_plugin "$plugin" "$action" &
else
# Build plugins after each other
build_plugin "$plugin" "$action"
fi
fi
done
wait

if [ $action == "dev" ]; then
wait
fi

0 comments on commit 5c8e4e2

Please sign in to comment.