Merge pull request #987 from mathics/docker-update

Update to docker setup

Author: rocky

app/Dockerfile

@@ -13,8 +13,8 @@ RUN apt-get update
 RUN apt-get install -qq liblapack-dev llvm-dev gfortran
 RUN pip install --no-cache-dir -r requirements.txt
 # RUN python -m nltk.downloader wordnet omw
-COPY requirements-tmathics.txt ./
-RUN pip install --no-cache-dir -r requirements-tmathics.txt
+COPY requirements-mathicsscript.txt ./
+RUN pip install --no-cache-dir -r requirements-mathicsscript.txt
 
 EXPOSE 8000
 

app/entrypoint.sh

@@ -47,7 +47,8 @@ echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo
 
 case $mathics_mode in
-    cli) tmathics $@ ;;
+    cli) mathicsscript $@ ;;
     ui)  mathicsserver -e $@ ;;
+    shell)  /bin/bash ;;
     *)   echo "unknown mathics_mode=$mathics_mode. See '$script_cmd --help'" ; exit 2 ;;
 esac

app/requirements-mathicsscript.txt

@@ -0,0 +1,4 @@
+mathics
+colorama
+pygments
+git+https://github.com/Mathics3/mathicsscript

app/requirements-tmathics.txt

@@ -1,5 +1,5 @@
 sympy>=1.6, < 1.7
-django >= 1.8, < 1.12
+django >= 3.1.2, < 3.2
 mpmath>=1.1.0
 numpy
 palettable