Move Poetry and npm installs to Dockerfile rather than dev startup sc…

…ript
nationalarchives · Dec 4, 2024 · 2e74e71 · 2e74e71
1 parent 8f86305
commit 2e74e71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/docker/tna-python-dev/Dockerfile b/docker/tna-python-dev/Dockerfile
@@ -45,4 +45,11 @@ ENV PATH="/home/app/.local/bin/tasks:/home/app/.local/bin/dev:$PATH"
 # ==========================================
 COPY --chown=app lib/* /home/app/
 
+# ==========================================
+# Install the tools required for linting and
+# fixing both Python and JS/CSS code
+# ==========================================
+RUN python -m pip install --quiet black==24.10.0 flake8==7.1.0 isort==5.13.2; \
+    npm install -g [email protected] [email protected] [email protected] [email protected] [email protected]
+
 CMD ["dev"]
diff --git a/docker/tna-python-dev/bin/dev b/docker/tna-python-dev/bin/dev
@@ -1,9 +1,6 @@
 #!/bin/bash
 
 poetry install --no-root --with dev || true
-python -m pip install --quiet black==24.10.0 flake8==7.1.0 isort==5.13.2
-
-cd /app || return
 
 . "$HOME/.nvm/nvm.sh"
 if [ -f "/app/.nvmrc" ]
@@ -12,7 +9,7 @@ then
 else
   nvm use default
 fi
-npm install -g [email protected] [email protected] [email protected] [email protected] [email protected]
+npm install
 
 if [ -d "/home/app/.local/bin/tasks" ]
 then