Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add some more defaults to env variables

Roland Geider53bf0426d4f7
diff --git a/extras/docker/development/entrypoint.sh b/extras/docker/development/entrypoint.sh
index 5cfd3942a..eac8ac9d3 100644
--- a/extras/docker/development/entrypoint.sh
+++ b/extras/docker/development/entrypoint.sh
@@ -34,13 +34,16 @@ wger bootstrap
# Collect static files
if [[ "$DJANGO_DEBUG" == "False" ]];
then
+ echo "Running in production mode, running collectstatic now"
python3 manage.py collectstatic --no-input
fi
# Run the server
if [[ "$WGER_USE_GUNICORN" == "True" ]];
then
+ echo "Using gunicorn..."
gunicorn wger.wsgi:application --reload --bind 0.0.0.0:8000
else
+ echo "Using django's development server..."
python3 manage.py runserver 0.0.0.0:8000
fi
diff --git a/extras/docker/development/settings.py b/extras/docker/development/settings.py
index e5cb1c1d4..660c2a90d 100644
--- a/extras/docker/development/settings.py
+++ b/extras/docker/development/settings.py
@@ -40,9 +40,9 @@ SECRET_KEY = os.environ.get("SECRET_KEY", 'wger-django-secret-key')
# Your reCaptcha keys
-RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY')
-RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY')
-NOCAPTCHA = os.environ.get('NOCAPTCHA')
+RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', '')
+RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', '')
+NOCAPTCHA = os.environ.get('NOCAPTCHA', '')
# The site's URL (e.g. http://www.my-local-gym.com or http://localhost:8000)
# This is needed for uploaded files and images (exercise images, etc.) to be