Rename apache image to demo

That's the image's purpose and which server is used is no important

.github/workflows/docker.yml

@@ -29,9 +29,9 @@ jobs:
         with:
           context: .
           push: true
-          file: extras/docker/apache/Dockerfile
+          file: extras/docker/demo/Dockerfile
           platforms: linux/amd64,linux/arm64
-          tags: wger/apache:latest,wger/apache:2.1-dev
+          tags: wger/demo:latest,wger/demo:2.1-dev,wger/apache:latest,wger/apache:2.1-dev
 
       - name: Build dev image
         uses: docker/build-push-action@v2.7.0

README.md

@@ -40,7 +40,7 @@ compose file. This config will persist your database and uploaded images:
 If you just want to try it out:
 
 ```shell script
-    docker run -ti --name wger.apache --publish 8000:80 wger/apache
+    docker run -ti --name wger.demo--publish 8000:80 wger/demo
 ```
 
 Then just open <http://localhost:8000> and log in as **admin**, password **adminadmin**

docs/docker.rst

@@ -8,21 +8,22 @@ them yourself.
 Note that you need to build from the project's source folder, e.g::
 
     docker build -f extras/docker/development/Dockerfile -t wger/devel .
-    docker build -f extras/docker/apache/Dockerfile --tag wger/apache .
+    docker build -f extras/docker/apache/Dockerfile --tag wger/demo .
 
 
-Apache
-------
+Demo
+----
 
-This image runs the application using WSGI and apache.
+Self contained demo image
 
 Get the image::
 
-    docker pull wger/apache
+    docker pull wger/demo
 
 Run a container and start the application::
 
-    docker run -ti --name wger.apache --publish 8000:80 wger/apache
+    docker run -ti --name wger.demo --publish 8000:80 wger/demo
+
 
 Then just open http://localhost:8000 and log in as: **admin**, password **adminadmin**
 

extras/docker/compose/README.md

@@ -12,7 +12,7 @@ as well, for easy integration with other projects and tools.
 This docker-compose file starts up a development environment with django's
 development server, postgres as a database and redis for caching and saving
 the sessions. It binds your current code checkout into the volume, if you
-don't want or have one, use the `wger/apache` image, it is self-contained.
+don't want or have one, use the `wger/demo` image, it is self-contained.
 
 ### 1 - Start all services
 

extras/docker/demo/Dockerfile

@@ -2,10 +2,10 @@
 # A wger installation under apache with WSGI
 #
 # Note: you MUST build this image from the project's root!
-# docker build -f extras/docker/apache/Dockerfile --tag wger/apache .
+# docker build -f extras/docker/apache/Dockerfile --tag wger/demo .
 #
 # Please consult the documentation for usage
-# docker run -ti --name wger.apache --publish 8000:80 wger/apache
+# docker run -ti --name wger.demo --publish 8000:80 wger/demo
 #
 # To stop the container:
 # sudo docker container stop wger.apache

extras/docker/demo/README.md

@@ -21,7 +21,7 @@ process under apache with a sqlite database. It is useful to just try it out and
 play around. To start it:
 
 
-```docker run -ti --name wger.apache --publish 8000:80 wger/apache```
+```docker run -ti --name wger.demo --publish 8000:80 wger/demo```
 
 Then just open <http://localhost:8000> and log in as: **admin**, password **adminadmin**
 
@@ -40,7 +40,7 @@ Building
 If you build this yourself, keep in mind that you **must** build from the
 project root!
 
-```docker build -f extras/docker/apache/Dockerfile --tag wger/apache .```
+```docker build -f extras/docker/apache/Dockerfile --tag wger/demo .```
 
 
 Contact

extras/docker/development/README.md

@@ -15,7 +15,7 @@ host your own instance, take a look at the provided docker compose file:
 
 This docker image is meant to provide a quick development environment using
 django's development server and an sqlite database from your current code
-checkout (if you don't want or need a local checkout, use the wger/apache image,
+checkout (if you don't want or need a local checkout, use the wger/demo image,
 it is self-contained).
 
 A more comfortable development version is provided in the compose folder.