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.ymlindex 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/Dockerfileplatforms: 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 imageuses: docker/[email protected]diff --git a/README.md b/README.mdindex 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.rstindex 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 imageGet the image::- docker pull wger/apache+ docker pull wger/demoRun 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.mdindex 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'sdevelopment server, postgres as a database and redis for caching and savingthe 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 servicesdiff --git a/extras/docker/apache/Dockerfile b/extras/docker/demo/Dockerfilesimilarity index 95%rename from extras/docker/apache/Dockerfilerename to extras/docker/demo/Dockerfileindex 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.apachediff --git a/extras/docker/apache/README.md b/extras/docker/demo/README.mdsimilarity index 94%rename from extras/docker/apache/README.mdrename to extras/docker/demo/README.mdindex 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 andplay 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 @@ BuildingIf you build this yourself, keep in mind that you **must** build from theproject root!-```docker build -f extras/docker/apache/Dockerfile --tag wger/apache .```+```docker build -f extras/docker/apache/Dockerfile --tag wger/demo .```Contactdiff --git a/extras/docker/apache/crontab b/extras/docker/demo/crontabsimilarity index 100%rename from extras/docker/apache/crontabrename to extras/docker/demo/crontabdiff --git a/extras/docker/apache/entrypoint.sh b/extras/docker/demo/entrypoint.shold mode 100755new mode 100644similarity index 100%rename from extras/docker/apache/entrypoint.shrename to extras/docker/demo/entrypoint.shdiff --git a/extras/docker/apache/venvwrapper b/extras/docker/demo/venvwrappersimilarity index 100%rename from extras/docker/apache/venvwrapperrename to extras/docker/demo/venvwrapperdiff --git a/extras/docker/apache/wger.conf b/extras/docker/demo/wger.confsimilarity index 100%rename from extras/docker/apache/wger.confrename to extras/docker/demo/wger.confdiff --git a/extras/docker/development/README.md b/extras/docker/development/README.mdindex 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 usingdjango'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.