Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Make clearer what each docker image does and what not

Roland Geiderb4591857a7c9
diff --git a/README.md b/README.md
index d4232ff29..3453d770b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
# wger
-
wger (ˈvɛɡɐ) Workout Manager is a free, open source web application that help
you manage your personal workouts, weight and diet plans and can also be used
as a simple gym management utility. It offers a REST API as well, for easy
@@ -25,8 +24,14 @@ parameters.
### Docker
-Useful to just try it out. Check the READMES in wger/extras/docker on how to use
-the wger/devel docker image or the docker-compose file for development:
+If you want to host your own instance, take a look at the provided docker
+compose file. This config will persist your database and uploaded images:
+
+<https://github.com/wger-project/docker>
+
+### Demo
+
+If you just want to try it out:
```shell script
docker run -ti --name wger.apache --publish 8000:80 wger/apache
@@ -34,8 +39,17 @@ the wger/devel docker image or the docker-compose file for development:
Then just open <http://localhost:8000> and log in as **admin**, password **admin**
+Please note that this image will overwrite your data when you pull a new version,
+it is only intended as an easy to setup demo
+
+### Development version
+
+#### Docker
+
+To develop, check the README in wger/extras/docker on how to use
+the wger/devel docker image or the docker-compose file for development
-### Development version (from git)
+#### Local installation (git)
**Note:** You can safely install from master, it is almost always in a usable
and stable state.
diff --git a/extras/docker/apache/README.md b/extras/docker/apache/README.md
index 87acc17a1..d086842b8 100644
--- a/extras/docker/apache/README.md
+++ b/extras/docker/apache/README.md
@@ -1,12 +1,17 @@
Demo image for wger
===================
-Thank you for downloading wger Workout Manager. wger (ˈvɛɡɐ) is a free, open
-source web application that manages your exercises and personal workouts, weight
-and diet plans. It can also be used as a simple gym management utility, providing
-different administrative roles (trainer, manager, etc.). It offers a REST API
-as well, for easy integration with other projects and tools.
+wger (ˈvɛɡɐ) Workout Manager is a free, open source web application that help
+you manage your personal workouts, weight and diet plans and can also be used
+as a simple gym management utility. It offers a REST API as well, for easy
+integration with other projects and tools.
-It is written with python/django and uses jQuery and some D3js for charts.
+
+Please note that this image will overwrite your data when you pull a new version,
+it is only intended as an easy to setup demo. If you want to host your own
+instance, take a look at the provided docker compose file. That config will
+persist your database and uploaded images:
+
+<https://github.com/wger-project/docker>
Installation
------------
diff --git a/extras/docker/compose/dev.env b/extras/docker/compose/dev.env
index c0532b43a..62418e8b3 100644
--- a/extras/docker/compose/dev.env
+++ b/extras/docker/compose/dev.env
@@ -14,3 +14,7 @@ DJANGO_CACHE_TIMEOUT=100
DJANGO_CACHE_CLIENT_CLASS=django_redis.client.DefaultClient
DJANGO_MEDIA_ROOT=/home/wger/media
+
+# Others
+DJANGO_DEBUG=True
+WGER_USE_GUNICORN=False
diff --git a/extras/docker/development/README.md b/extras/docker/development/README.md
index bf667ecf7..1f0a31d71 100644
--- a/extras/docker/development/README.md
+++ b/extras/docker/development/README.md
@@ -1,10 +1,15 @@
# Development image for wger
+wger (ˈvɛɡɐ) Workout Manager is a free, open source web application that help
+you manage your personal workouts, weight and diet plans and can also be used
+as a simple gym management utility. It offers a REST API as well, for easy
+integration with other projects and tools.
+
+
+Please note that this image is intended for development, if you want to
+host your own instance, take a look at the provided docker compose file:
+
+<https://github.com/wger-project/docker>
-Thank you for downloading wger Workout Manager. wger (ˈvɛɡɐ) is a free, open
-source web application that manages your exercises and personal workouts, weight
-and diet plans. It can also be used as a simple gym management utility, providing
-different administrative roles (trainer, manager, etc.). It offers a REST API
-as well, for easy integration with other projects and tools.
## Usage
diff --git a/extras/docker/development/entrypoint.sh b/extras/docker/development/entrypoint.sh
index 58a9202ee..08fb5f625 100644
--- a/extras/docker/development/entrypoint.sh
+++ b/extras/docker/development/entrypoint.sh
@@ -25,12 +25,18 @@ then
chmod -R g+w ~wger/media
fi
+# Collect static files
+if [[ "$DJANGO_DEBUG" == "False" ]];
+then
+ python3 manage.py collectstatic
+fi
+
# Run the server
-if [ -z "$WGER_USE_GUNICORN" ]
+if [[ "$WGER_USE_GUNICORN" == "True" ]];
then
- python3 manage.py runserver 0.0.0.0:8000
-else
gunicorn wger.wsgi:application --reload --bind 0.0.0.0:8000
+else
+ python3 manage.py runserver 0.0.0.0:8000
fi