mathics:latest has to be used for now

Author: rocky

Makefile

@@ -40,11 +40,11 @@ dist:
 
 #: Pull mathics docker image from dockerhub with tag $(TAG). The default tag is "latest".
 docker-pull:
-	$(DOCKER) pull mathicsorg/mathics3:$(TAG)
+	$(DOCKER) pull mathicsorg/mathics:$(TAG)
 
 #: Push local docker image to dockerhub with tag $(TAG). The default tag is "latest".
 install push upload:
-	$(DOCKER) push mathicsorg/mathics3:$(TAG)
+	$(DOCKER) push mathicsorg/mathics:$(TAG)
 
 #: Build docker image with cache clearing
 docker-image:

README.rst

@@ -18,7 +18,7 @@ That's what this repository is about. Here we have a PyPI installable package th
 * ``dmathics3doc`` which runs a PDF viewer, `evince <https://wiki.gnome.org/Apps/Evince>`_, which can view the generated reference manual in PDF.
 * ``dmathics3doccopy`` which copies the generated reference PDF manual out of the container and into the host filesystem.
 
-This repository also contains the Dockerfiles used to create the `mathicsorg/mathics3 docker images <https://hub.docker.com/repository/docker/mathicsorg/mathic3s>`_.
+This repository also contains the Dockerfiles used to create the `mathicsorg/mathics docker images <https://hub.docker.com/repository/docker/mathicsorg/mathics>`_.
 
 That image is a combination of:
 
@@ -54,9 +54,9 @@ To install from Python ``pip``::
 
 To install the Docker image, run::
 
-  docker pull mathicsorg/mathics3
+  docker pull mathicsorg/mathics
 
-See `<https://hub.docker.com/r/mathicsorg/mathics3>`_ for more information on how to use it after installing
+See `<https://hub.docker.com/r/mathicsorg/mathics>`_ for more information on how to use it after installing
 
 From GitHub:
 ++++++++++++

docker-compose-dev.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
     mathics:
         build: ./docker
-        image: mathicsorg/mathics3:latest
+        image: mathicsorg/mathics:latest
 
         volumes:
             - ./app/data:/usr/src/app/data

docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
     mathics:
         build: ./docker
-        image: mathicsorg/mathics3:latest
+        image: mathicsorg/mathics:latest
 
         volumes:
             - ./app/data:/usr/src/app/data

script/dmathics3

@@ -11,7 +11,7 @@ typeset dmathics_version='1.0.0'
 DOCKER=${DOCKER:-docker}
 
 TAG=${TAG:-latest}
-MATHICS3_IMAGE=${MATHICS3_IMAGE:-mathicsorg/mathics3:${TAG}}
+MATHICS3_IMAGE=${MATHICS3_IMAGE:-mathicsorg/mathics:${TAG}}
 
 for arg in "$@" ; do
     case "$arg" in

script/dmathics3-code-parse

@@ -11,7 +11,7 @@ typeset dmathics_version='1.0.0'
 DOCKER=${DOCKER:-docker}
 
 TAG=${TAG:-latest}
-MATHICS3_IMAGE=${MATHICS3_IMAGE:-mathicsorg/mathics3:${TAG}}
+MATHICS3_IMAGE=${MATHICS3_IMAGE:-mathicsorg/mathics:${TAG}}
 
 # Show environment variables
 for env_setting in MATHICS3_IMAGE; do

script/dmathics3-code-tokenize

@@ -11,7 +11,7 @@ typeset dmathics_version='1.0.0'
 DOCKER=${DOCKER:-docker}
 
 TAG=${TAG:-latest}
-MATHICS3_IMAGE=${MATHICS3_IMAGE:-mathicsorg/mathics3:${TAG}}
+MATHICS3_IMAGE=${MATHICS3_IMAGE:-mathicsorg/mathics:${TAG}}
 
 # Show environment variables
 for env_setting in MATHICS3_IMAGE; do

script/dmathics3.cmd

@@ -1,3 +1,3 @@
 # Simple Powershell command file to run mathics
 # FIXME: add features of bash script
-docker run --name dmathics3-cli --rm --tty --interactive --network=host mathicsorg/mathics3:latest --mode mathics3
+docker run --name dmathics3-cli --rm --tty --interactive --network=host mathicsorg/mathics:latest --mode mathics3

script/dmathics3copy

@@ -9,7 +9,7 @@ DOCKER=${DOCKER:-docker}
 TEMPDIR=${TMPDIR:-/tmp}
 
 TAG=${TAG:-latest}
-MATHICS3_IMAGE=${MATHICS3_IMAGE:-mathicsorg/mathics3:${TAG}}
+MATHICS3_IMAGE=${MATHICS3_IMAGE:-mathicsorg/mathics:${TAG}}
 
 for arg in "$@" ; do
     case "$arg" in

script/dmathics3doc

@@ -11,7 +11,7 @@ typeset dmathicsdoc_version='1.0.0'
 DOCKER=${DOCKER:-docker}
 
 TAG=${TAG:-latest}
-MATHICS3_IMAGE=${MATHICS3_IMAGE:-mathicsorg/mathics3:${TAG}}
+MATHICS3_IMAGE=${MATHICS3_IMAGE:-mathicsorg/mathics:${TAG}}
 
 for arg in "$@" ; do
     case "$arg" in