Merge pull request #2860 from HyphaApp/fix/docker-build

Move npm install command to entrypoint script.

docker/Dockerfile.dev

 FROM cimg/python:3.9.10-node
 
-# Set work directory
+# Set work directory.
 WORKDIR /usr/local/hypha
 
-# Set environment variables
+# Set environment variables.
 ENV API_BASE_URL http://apply.hypha.test:8090/api
 ENV DATABASE_URL postgres://hypha:hypha@db:5432/hypha
 ENV DJANGO_SETTINGS_MODULE hypha.settings.dev
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
-# Prepare for npm
-COPY package.json package-lock.json /usr/local/hypha/
-
 # Set owner on /usr/local.
 RUN sudo chown -R circleci:circleci /usr/local
-USER circleci
-
-# Install node dependencies.
-RUN npm install --global --quiet
 
 # Install python dependencies.
 COPY requirements.txt requirements-dev.txt /usr/local/hypha/
 RUN pip3 install --quiet -r requirements-dev.txt
 
-# Run entrypoint.sh
+# Run entrypoint.sh.
 ENTRYPOINT ["/usr/local/hypha/docker/entrypoint.dev.sh"]

docker/entrypoint.dev.sh

 #!/bin/sh
 
-#npm install --quiet
+# Install node packages and run build command.
+npm install --quiet
 npm run build
 
-#pip3 install --quiet -r requirements-dev.txt
+# Run needed python commands.
 python3 manage.py createcachetable
 python3 manage.py collectstatic --noinput --verbosity=0
 python3 manage.py migrate
 python3 manage.py wagtailsiteupdate hypha.test apply.hypha.test 8090
+
+# Start gunicorn server.
 gunicorn hypha.wsgi:application --env DJANGO_SETTINGS_MODULE=hypha.settings.dev --reload  --bind 0.0.0.0:9001
 
 exec "$@"