Inch towards custom dmathicsserver sql db

Author: rocky

docker/Dockerfile

@@ -13,7 +13,7 @@ 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
-RUN apt-get install -qq liblapack-dev llvm-dev gfortran maria
+RUN apt-get install -qq liblapack-dev llvm-dev gfortran maria sqlite3
 RUN pip install --no-cache-dir -r requirements.txt
 COPY requirements-mathicsscript.txt ./
 RUN pip install --no-cache-dir -r requirements-mathicsscript.txt

docker/Dockerfile-dev

@@ -13,7 +13,7 @@ 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
-RUN apt-get install -qq liblapack-dev llvm-dev gfortran maria
+RUN apt-get install -qq liblapack-dev llvm-dev gfortran maria sqlite3
 RUN pip install --no-cache-dir -r requirements.txt
 COPY requirements-mathicsscript.txt ./
 RUN pip install --no-cache-dir -r requirements-mathicsscript.txt

docker/django-db/mathics.sqlite

@@ -43,15 +43,23 @@ done
 
 echo
 echo "~~~~ app/data has been mounted to $MATHICS_HOME/data ~~~~"
-echo "$ ls $MATHICS_HOME/data"
-ls -p $MATHICS_HOME/data
+if [[ -n $MATHICS_DJANGO_DB_PATH ]]; then
+    echo "~~~~ SQLite data (worksheets, user info) will be stored in $MATHICS_DJANGO_DB_PATH ~~~~"
+else
+    echo "~~~~ SQLite data (worksheets, user info) will be stored in $MATHICS_HOME/data/mathics.sqlite"
+fi
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo
 
 case $mathics_mode in
-    cli) mathicsscript $@ ;;
-    minimal|mathics)  mathics $@ ;;
-    ui|gui)  mathicsserver -e $@ ;;
+    cli) mathicsscript
+	 $@
+	 ;;
+    minimal|mathics)
+	mathics $@
+	;;
+    ui|gui)
+	mathicsserver -e $@ ;;
     shell)  /bin/bash ;;
     *)   echo "unknown mathics_mode=$mathics_mode. See '$script_cmd --help'" ; exit 2 ;;
 esac

docker/entrypoint.sh

@@ -1,10 +1,16 @@
 #!/bin/bash
 set -x
+
+# Allow customization using POSIX environment variables:
 DOCKER=${DOCKER:-docker}
+MATHICS_DJANGO_DB=${MATHICS_DJANGO_DB:-"mathics.sqlite"}
+MATHICS_DJANGO_DB_PATH=${MATHICS_DJANGO_DB_PATH:-DOCKER=/usr/src/app/data mathicsorg/mathics/${MATHICS_DJANGO_DB_PATH}}
+
 $DOCKER run -it \
   --name mathics-web \
   --rm \
   --env="DISPLAY" \
+  --env="MATHICS_DJANGO_DB_PATH=$MATHICS_DJANGO_DB_PATH" \
   --workdir=/app \
   --volume="$PWD":/app \
   --volume="/tmp/.X11-unix:/tmp/.X11-unix:rw" \