Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Rename apache image to demo

Roland Geider3db6b38eceff
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5e7d19d8e..0d11c4c6b 100644
--- a/.github/workflows/docker.yml
+++ b/.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/[email protected]
diff --git a/README.md b/README.md
index 6e37d0f20..320ad4e7b 100644
--- a/README.md
+++ b/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**
diff --git a/docs/docker.rst b/docs/docker.rst
index c2298603c..b7d1db886 100644
--- a/docs/docker.rst
+++ b/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**
diff --git a/extras/docker/compose/README.md b/extras/docker/compose/README.md
index 8625a7df3..3e4a7c073 100644
--- a/extras/docker/compose/README.md
+++ b/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
diff --git a/extras/docker/apache/Dockerfile b/extras/docker/demo/Dockerfile
similarity index 95%
rename from extras/docker/apache/Dockerfile
rename to extras/docker/demo/Dockerfile
index cd985c4d9..8d02b565f 100644
--- a/extras/docker/apache/Dockerfile
+++ b/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
diff --git a/extras/docker/apache/README.md b/extras/docker/demo/README.md
similarity index 94%
rename from extras/docker/apache/README.md
rename to extras/docker/demo/README.md
index 56fa2225e..497eaa3d4 100644
--- a/extras/docker/apache/README.md
+++ b/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
diff --git a/extras/docker/apache/crontab b/extras/docker/demo/crontab
similarity index 100%
rename from extras/docker/apache/crontab
rename to extras/docker/demo/crontab
diff --git a/extras/docker/apache/entrypoint.sh b/extras/docker/demo/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from extras/docker/apache/entrypoint.sh
rename to extras/docker/demo/entrypoint.sh
diff --git a/extras/docker/apache/venvwrapper b/extras/docker/demo/venvwrapper
similarity index 100%
rename from extras/docker/apache/venvwrapper
rename to extras/docker/demo/venvwrapper
diff --git a/extras/docker/apache/wger.conf b/extras/docker/demo/wger.conf
similarity index 100%
rename from extras/docker/apache/wger.conf
rename to extras/docker/demo/wger.conf
diff --git a/extras/docker/development/README.md b/extras/docker/development/README.md
index ac06f1d45..9414bea09 100644
--- a/extras/docker/development/README.md
+++ b/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.