Skip to content

Commit

Permalink
Move npm linting tools back to dev script from Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
ahosgood committed Dec 16, 2024
1 parent c8bbaca commit b5d6e7b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/actions/lint/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ runs:
run: |
cd ${{ inputs.dockerfile-location }}
[ -d "./bin" ] && shellcheck --external-sources --exclude=SC1091 ./bin/*
shellcheck --external-sources --exclude=SC2148 --exclude=SC1091 ./Dockerfile
shellcheck --external-sources --exclude=SC2148 ./Dockerfile
shell: bash
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Installation of formatting and linting tools moved to `Dockerfile` so are available at startup of the dev image
- Installation of Python formatting and linting tools moved to `Dockerfile` so are available at startup of the dev image
- Updated `prettier`, `stylelint` and `stylelint-config-standard-scss` in `tna-python-dev`
- Updated Poetry to [1.8.5](https://github.com/python-poetry/poetry/releases/tag/1.8.5)
- Updated Stylelint to [16.12.0](https://github.com/stylelint/stylelint/releases/tag/16.12.0)
Expand Down
6 changes: 2 additions & 4 deletions docker/tna-python-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,8 @@ COPY --chown=app lib/* /home/app/

# ==========================================
# Install the tools required for linting and
# fixing both Python and JS/CSS code
# fixing Python
# ==========================================
RUN python -m pip install --no-cache-dir --quiet black==24.10.0 flake8==7.1.1 isort==5.13.2; \
. "$HOME/.nvm/nvm.sh"; \
npm install -g [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
RUN python -m pip install --no-cache-dir --quiet black==24.10.0 flake8==7.1.1 isort==5.13.2

CMD ["dev"]
1 change: 1 addition & 0 deletions docker/tna-python-dev/bin/dev
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ then
else
nvm use default
fi
npm install -g [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
npm install

if [ -d "/home/app/.local/bin/tasks" ]
Expand Down

0 comments on commit b5d6e7b

Please sign in to comment.