aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoram97 <andy.maldo@hotmail.com>2020-02-23 19:27:39 +0100
committerGitHub <noreply@github.com>2020-02-23 19:27:39 +0100
commiteea50b9b2c6963e7b0f5cdb3fda3684c51958533 (patch)
tree52b133662bf9dafcead5b979a5280d43acc9fcff
parentd128e84860b8b8c14d27a4d43f11b751f73f6daf (diff)
downloadihatemoney-mirror-eea50b9b2c6963e7b0f5cdb3fda3684c51958533.zip
ihatemoney-mirror-eea50b9b2c6963e7b0f5cdb3fda3684c51958533.tar.gz
ihatemoney-mirror-eea50b9b2c6963e7b0f5cdb3fda3684c51958533.tar.bz2
Misc small updates (#536)
-rw-r--r--CHANGELOG.rst2
-rwxr-xr-xconf/entrypoint.sh4
-rw-r--r--docs/index.rst4
-rw-r--r--docs/installation.rst4
4 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f4f4b5a..76831cc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -54,7 +54,7 @@ Changed
- Improve usability specially for small screen (#441)
- Replace export forms by links (#450)
- Rework homepage design (#445)
-- Docker now downloads IHM from Pypy or the reference git repo (#446)
+- Docker now downloads IHM from PyPI or the reference git repo (#446)
- Arrange navbar items by functions (#445)
diff --git a/conf/entrypoint.sh b/conf/entrypoint.sh
index 07dcc63..0d5a7a3 100755
--- a/conf/entrypoint.sh
+++ b/conf/entrypoint.sh
@@ -22,7 +22,7 @@ ALLOW_PUBLIC_PROJECT_CREATION = $ALLOW_PUBLIC_PROJECT_CREATION
ACTIVATE_ADMIN_DASHBOARD = $ACTIVATE_ADMIN_DASHBOARD
EOF
-if [ ! -z "$NIGHTLY" ]; then
+if [ "$NIGHTLY" == "True" -o "$NIGHTLY" == "true" ]; then
# Clone or update repository into /ihatemoney.
if [ ! -d /ihatemoney/.git ]; then
echo "Cloning..."
@@ -36,7 +36,7 @@ if [ ! -z "$NIGHTLY" ]; then
fi
pip install --no-cache-dir -e /ihatemoney
else
- # Get the latest release from PyPy.
+ # Get the latest release from PyPI.
pip install --no-cache-dir --upgrade ihatemoney
fi
diff --git a/docs/index.rst b/docs/index.rst
index 915f324..3b55c35 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -9,8 +9,8 @@ I hate money is written in python, using the `flask <https://palletsprojects.com
framework. It's developped with ease of use in mind, and is trying to
keep things simple. Hope you (will) like it!
-Table of content
-================
+Table of contents
+=================
.. toctree::
:maxdepth: 1
diff --git a/docs/installation.rst b/docs/installation.rst
index 5084a32..4994499 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -17,7 +17,7 @@ Requirements
«Ihatemoney» depends on:
-* **Python**: either 2.7, 3.4, 3.5, 3.6 will work.
+* **Python**: either 3.5, 3.6 or 3.7 will work.
* **A Backend**: to choose among MySQL, PostgreSQL, SQLite or Memory.
* **Virtualenv** (recommended): `virtualenv` package under Debian/Ubuntu.
@@ -231,6 +231,8 @@ A volume can also be specified to persist the default database file::
docker run -d -p 8000:8000 -v /host/path/to/database:/database ihatemoney
+If you want to run the latest version, you can pass `-e NIGHTLY="true"`.
+
Additional gunicorn parameters can be passed using the docker ``CMD``
parameter.
For example, use the following command to add more gunicorn workers::