Update dockerfile for Django npm needs

Author: rocky

docker/Dockerfile-dev

@@ -15,8 +15,8 @@ RUN apt-get update
 RUN apt-get install -qq apt-utils
 # we need libsqlite3-dev now if ubuntu doesn't come with that, we'll need
 # to build our own Python
-# Leave out inkscape
-RUN DEBIAN_FRONTEND="noninteractive" TZ="US/Eastern" apt-get install -qq liblapack-dev llvm-10 llvm-10-dev gfortran maria libmysqlclient-dev sqlite3 python3-pip python3-setuptools git python3-matplotlib python-matplotlib-data x11-apps asymptote w3m latexmk texlive-xetex lmodern texlive-latex-extra texlive-fonts-recommended
+# Leave out inkscape  for now.
+RUN DEBIAN_FRONTEND="noninteractive" TZ="US/Eastern" apt-get install -qq liblapack-dev llvm-10 llvm-10-dev gfortran maria libmysqlclient-dev sqlite3 python3-pip python3-setuptools git python3-matplotlib python-matplotlib-data x11-apps asymptote w3m latexmk texlive-xetex lmodern texlive-latex-extra texlive-fonts-recommended nodejs
 RUN pip install --no-cache-dir -r requirements.txt
 COPY requirements-mathicsscript.txt ./
 RUN pip install --no-cache-dir -r requirements-mathicsscript.txt
@@ -35,8 +35,9 @@ RUN ${PYTHON} -m pip install -e git://github.com/Mathics3/mathics-django#egg=Mat
 
 RUN pip install pymathics-natlang
 RUN pip install pymathics-graph
+RUN (cd src/mathics-django && npm install && make)
 RUN (cd src/mathics-django && ${PYTHON} mathics_django/docpipeline.py -o)
-RUN mkdir -p /usr/src/app/.local/var/mathics && cp -v /root/.local/var/mathics/doc_data.pcl /usr/src/app/.local/var/mathics/doc_data.pcl nodejs
+RUN mkdir -p /usr/src/app/.local/var/mathics && cp -v /root/.local/var/mathics/doc_data.pcl /usr/src/app/.local/var/mathics/doc_data.pcl
 
 RUN ${PYTHON} -m pip install -e git://github.com/Mathics3/mathicsscript#egg=mathicsscript[full]
 RUN (cd src/mathicsscript && make)

docker/Dockerfile-dev+debug

@@ -16,7 +16,7 @@ RUN apt-get install -qq apt-utils
 # we need libsqlite3-dev now if ubuntu doesn't come with that, we'll need
 # to build our own Python
 # Leave out inkscape  for now.
-RUN DEBIAN_FRONTEND="noninteractive" TZ="US/Eastern" apt-get install -qq liblapack-dev llvm-10 llvm-10-dev gfortran maria libmysqlclient-dev sqlite3 python3-pip python3-setuptools git python3-matplotlib python-matplotlib-data x11-apps asymptote w3m latexmk texlive-xetex lmodern texlive-latex-extra texlive-fonts-recommended
+RUN DEBIAN_FRONTEND="noninteractive" TZ="US/Eastern" apt-get install -qq liblapack-dev llvm-10 llvm-10-dev gfortran maria libmysqlclient-dev sqlite3 python3-pip python3-setuptools git python3-matplotlib python-matplotlib-data x11-apps asymptote w3m latexmk texlive-xetex lmodern texlive-latex-extra texlive-fonts-recommended nodejs npm
 RUN pip install --no-cache-dir -r requirements.txt
 COPY requirements-mathicsscript.txt ./
 RUN pip install --no-cache-dir -r requirements-mathicsscript.txt
@@ -36,8 +36,9 @@ RUN ${PYTHON} -m pip install -e git://github.com/Mathics3/mathics-django#egg=Mat
 
 RUN pip install pymathics-natlang
 RUN pip install pymathics-graph
+RUN (cd src/mathics-django && npm install && make)
 RUN (cd src/mathics-django && ${PYTHON} mathics_django/docpipeline.py -o)
-RUN mkdir -p /usr/src/app/.local/var/mathics && cp -v /root/.local/var/mathics/doc_data.pcl /usr/src/app/.local/var/mathics/doc_data.pcl nodejs
+RUN mkdir -p /usr/src/app/.local/var/mathics && cp -v /root/.local/var/mathics/doc_data.pcl /usr/src/app/.local/var/mathics/doc_data.pcl
 
 RUN ${PYTHON} -m pip install -e git://github.com/Mathics3/mathicsscript#egg=mathicsscript[full]
 RUN (cd src/mathicsscript && make)