root: fix static docker's rollup build

This commit is contained in:
Jens Langhammer 2020-10-05 23:51:29 +02:00
parent cf6ce9c915
commit 9df00e09a4
3 changed files with 8 additions and 5 deletions

View File

@ -1,7 +1,7 @@
{ {
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"build": "rollup -c", "build": "rollup -c ./rollup.config.js",
"watch": "rollup -c -w" "watch": "rollup -c -w"
}, },
"dependencies": { "dependencies": {

View File

@ -36,8 +36,10 @@ ENV PASSBOOK_POSTGRESQL__USER=passbook
ENV PASSBOOK_POSTGRESQL__PASSWORD="EK-5jnKfjrGRm<77" ENV PASSBOOK_POSTGRESQL__PASSWORD="EK-5jnKfjrGRm<77"
RUN ./manage.py collectstatic --no-input RUN ./manage.py collectstatic --no-input
FROM node as npm-packager FROM node as npm-builder
COPY --from=static-build /app/static/src /static/src
COPY --from=static-build /app/static/rollup.config.js /static/rollup.config.js
COPY --from=static-build /app/static/package.json /static/package.json COPY --from=static-build /app/static/package.json /static/package.json
COPY --from=static-build /app/static/package-lock.json /static/package-lock.json COPY --from=static-build /app/static/package-lock.json /static/package-lock.json
@ -47,4 +49,5 @@ FROM nginx
COPY --from=static-build /app/static /usr/share/nginx/html/static COPY --from=static-build /app/static /usr/share/nginx/html/static
COPY --from=static-build /app/static/robots.txt /usr/share/nginx/html/robots.txt COPY --from=static-build /app/static/robots.txt /usr/share/nginx/html/robots.txt
COPY --from=npm-packager /static/node_modules /usr/share/nginx/html/static/node_modules COPY --from=npm-builder /static/node_modules /usr/share/nginx/html/static/node_modules
COPY --from=npm-builder /static/passbook/passbook.js* /usr/share/nginx/html/static/passbook/

View File

@ -6036,12 +6036,12 @@ definitions:
- login - login
- login_failed - login_failed
- logout - logout
- sign_up - user_write
- authorize_application
- suspicious_request - suspicious_request
- password_set - password_set
- invitation_created - invitation_created
- invitation_used - invitation_used
- authorize_application
- source_linked - source_linked
- impersonation_started - impersonation_started
- impersonation_ended - impersonation_ended