mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-22 09:31:08 +00:00
Code Issues Projects Releases Wiki Activity

bw-dev: drop use of npm exec by setting PATH in Docker image

Browse source
This commit is contained in:
Adeodato Simó 2023-10-18 18:52:39 -03:00
parent 6392a8e01d
commit b78d51410b
No known key found for this signature in database
GPG key ID: CDF447845F1A986F
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bw-dev
View file

@ -188,31 +188,25 @@ case "$CMD" in
;; ;;
prettier) prettier)
prod_error prod_error
$DOCKER_COMPOSE run --rm dev-tools npm exec --prefix dev-tools -- prettier \ $DOCKER_COMPOSE run --rm dev-tools prettier --write bookwyrm/static/js/*.js
--write bookwyrm/static/js/*.js
;; ;;
eslint) eslint)
prod_error prod_error
$DOCKER_COMPOSE run --rm dev-tools npm exec --prefix devtools -- eslint \ $DOCKER_COMPOSE run --rm dev-tools eslint bookwyrm/static --ext .js
bookwyrm/static --ext .js
;; ;;
stylelint) stylelint)
prod_error prod_error
$DOCKER_COMPOSE run --rm dev-tools npm exec --prefix dev-tools -- stylelint --fix \ $DOCKER_COMPOSE run --rm dev-tools stylelint --fix bookwyrm/static/css \
--config dev-tools/.stylelintrc.js --ignore-path dev-tools/.stylelintignore \ --config dev-tools/.stylelintrc.js --ignore-path dev-tools/.stylelintignore
bookwyrm/static/css
;; ;;
formatters) formatters)
prod_error prod_error
runweb pylint bookwyrm/ runweb pylint bookwyrm/
$DOCKER_COMPOSE run --rm dev-tools black celerywyrm bookwyrm $DOCKER_COMPOSE run --rm dev-tools black celerywyrm bookwyrm
$DOCKER_COMPOSE run --rm dev-tools npm exec --prefix dev-tools -- prettier \ $DOCKER_COMPOSE run --rm dev-tools prettier --write bookwyrm/static/js/*.js
--write bookwyrm/static/js/*.js $DOCKER_COMPOSE run --rm dev-tools eslint bookwyrm/static --ext .js
$DOCKER_COMPOSE run --rm dev-tools npm exec --prefix devtools -- eslint \ $DOCKER_COMPOSE run --rm dev-tools stylelint --fix bookwyrm/static/css \
bookwyrm/static --ext .js --config dev-tools/.stylelintrc.js --ignore-path dev-tools/.stylelintignore
$DOCKER_COMPOSE run --rm dev-tools npm exec --prefix dev-tools -- stylelint --fix \
--config dev-tools/.stylelintrc.js --ignore-path dev-tools/.stylelintignore \
bookwyrm/static/css
;; ;;
mypy) mypy)
prod_error prod_error

1
dev-tools/Dockerfile
View file

@ -1,6 +1,7 @@
FROM python:3.9 FROM python:3.9
WORKDIR /app/dev-tools WORKDIR /app/dev-tools
ENV PATH="/app/dev-tools/node_modules/.bin:$PATH"
ENV PYTHONUNBUFFERED=1 ENV PYTHONUNBUFFERED=1
ENV NPM_CONFIG_UPDATE_NOTIFIER=false ENV NPM_CONFIG_UPDATE_NOTIFIER=false
ENV PIP_ROOT_USER_ACTION=ignore PIP_DISABLE_PIP_VERSION_CHECK=1 ENV PIP_ROOT_USER_ACTION=ignore PIP_DISABLE_PIP_VERSION_CHECK=1