Self hosted FLOSS fitness/workout, nutrition and weight tracker
Update installation instructions
Roland Geider2216be1e8eb5
diff --git a/README.rst b/README.rstindex 855e29c79..5223a10d5 100644--- a/README.rst+++ b/README.rst@@ -31,6 +31,31 @@ Useful to just try it out::Then just open http://localhost:8000 and log in as: **admin**, password **admin**+Alternatively, there are docker images for development as well, ``wger/devel``+and ``wger/devel-fedora``. Both images contain an instance of the application+running with django's development server using a sqlite database and can be+used to quickly setup a development instance (vim and tmux are already+installed). The only difference is that devel has an ubuntu base image while+devel-fedora uses fedora.++::++ $ docker run -ti --name wger.devel --publish 8000:8000 wger/devel++Then, *within the docker image*, activate the virtualenv++::++ $ source ~/venv/bin/activate++and start the development server++::++ $ python manage.py runserver 0.0.0.0:8000++Then just open http://localhost:8000 and log in as: **admin**, password **admin**+Development version (from git)------------------------------@@ -46,12 +71,6 @@ and stable state.$ sudo apt-get install python3-dev python-virtualenv nodejs nodejs-legacy npm libjpeg8-dev zlib1g-dev git-On fedora 23--::-- $ sudo dnf install python3-devel python-virtualenv nodejs npm libjpeg-turbo-devel zlib-devel git-Then install the python packages from pypi in the virtualenv::$ virtualenv --python python3 venv-django@@ -77,41 +96,10 @@ Then install the python packages from pypi in the virtualenv::3) Log in as: **admin**, password **admin**-After the first run you can just use django's development server. You will-probably want to move the settings and sqlite files to your git folder, see-the comments in the documentation (development chapter) about this::+After the first run you can just use django's development server::$ python manage.py runserver-Docker images-~~~~~~~~~~~~~--Alternatively, there are docker images for development as well, ``wger/devel``-and ``wger/devel-fedora``. Both images contain an instance of the application-running with django's development server using a sqlite database and can be-used to quickly setup a development instance (vim and tmux are already-installed). The only difference is that devel has an ubuntu base image while-devel-fedora uses fedora.--::-- $ docker run -ti --name wger.devel --publish 8000:8000 wger/devel--Then, *within the docker image*, activate the virtualenv--::-- $ source ~/venv/bin/activate--and start the development server--::-- $ python manage.py runserver 0.0.0.0:8000--Then just open http://localhost:8000 and log in as: **admin**, password **admin**--Stable version (from PyPI)--------------------------@@ -137,6 +125,11 @@ Stable version (from PyPI)3) Log in as: **admin**, password **admin**+4) To start the installation again, just call wger start::++ $ wger start++Command line options--------------------You can get a list of all available commands by calling ``wger`` without anydiff --git a/docs/install.rst b/docs/install.rstindex dc9a29021..32f29ffa4 100644--- a/docs/install.rst+++ b/docs/install.rst@@ -35,6 +35,13 @@ These are the necessary packages for both development and productionpython-virtualenv python3-dev \libjpeg8-dev zlib1g-dev libwebp-dev+On fedora 23::++ sudo dnf install nodejs npm git \+ python-virtualenv python3-devel \+ libjpeg-turbo-devel zlib-devel++.. note::The application is developed with python 3, which these installationinstructions also use. If you want to use python 2.7, make sure you install