Self hosted FLOSS fitness/workout, nutrition and weight tracker
Cleanup
Roland Geider10bec7544c80
diff --git a/extras/docker/demo/Dockerfile b/extras/docker/demo/Dockerfileindex 5318cd224..5410006c5 100644--- a/extras/docker/demo/Dockerfile+++ b/extras/docker/demo/Dockerfile@@ -110,7 +110,7 @@ ENV DJANGO_SETTINGS_MODULE=settings.mainENV MEDIA_ROOT=/home/wger/mediaENV STATIC_ROOT=/home/wger/staticENV DJANGO_DB_DATABASE=/home/wger/db/database.sqlite-ENV COMPRESS_OFFLINE=True+ENV DJANGO_CACHE_BACKEND=django.core.cache.backends.locmem.LocMemCache# Change permissions of some files and folders so the apache process can access them.RUN mkdir -p ~/static/CACHE ~/media \diff --git a/extras/docker/production/entrypoint.sh b/extras/docker/production/entrypoint.shindex 8d9e3db92..e81d906a8 100644--- a/extras/docker/production/entrypoint.sh+++ b/extras/docker/production/entrypoint.sh@@ -65,8 +65,9 @@ fi# Sync ingredientsif [[ "$SYNC_INGREDIENTS_ON_STARTUP" == "True" ]];then- echo "Syncing ingredients"- python3 manage.py sync-ingredients+ echo "The option SYNC_INGREDIENTS_ON_STARTUP is not supported anymore as it needs several hours to complete."+ echo "Please start the process manually with: docker compose exec web python3 manage.py sync-ingredients"+ exit 1fi# Set the site URLdiff --git a/settings/local_dev.py b/settings/local_dev.pyindex 4e42693e2..d5c86eec9 100644--- a/settings/local_dev.py+++ b/settings/local_dev.py@@ -1,9 +1,10 @@"""Local development settings for wger"""# ruff: noqa: F405+# ruff: noqa: F403# wger-from .settings_global import * # noqa: F403+from .settings_global import *DEBUG = True@@ -119,6 +120,6 @@ DATABASES = {# Import other local settings that are not in version controltry:- from .local_dev_extra import * # noqa: F403+ from .local_dev_extra import *except ImportError:passdiff --git a/settings/main.py b/settings/main.pyindex 9db0935d9..2154e1412 100644--- a/settings/main.py+++ b/settings/main.py@@ -20,7 +20,12 @@ import environ# wgerfrom .settings_global import * # noqa: F403-"""Main settings file for a production deployment of wger."""+"""+Main settings file for a production deployment of wger.++For a more commented version of the options used here, please refer to+https://github.com/wger-project/docker/blob/master/config/prod.env+"""env = environ.Env(# set casting, default value@@ -136,10 +141,10 @@ if os.environ.get("DJANGO_CACHE_BACKEND"):CACHES = {'default': {'BACKEND': env.str("DJANGO_CACHE_BACKEND"),- 'LOCATION': env.str("DJANGO_CACHE_LOCATION"),- 'TIMEOUT': env.int("DJANGO_CACHE_TIMEOUT"),+ 'LOCATION': env.str("DJANGO_CACHE_LOCATION", ''),+ 'TIMEOUT': env.int("DJANGO_CACHE_TIMEOUT", 300),'OPTIONS': {- 'CLIENT_CLASS': env.str("DJANGO_CACHE_CLIENT_CLASS")+ 'CLIENT_CLASS': env.str("DJANGO_CACHE_CLIENT_CLASS", '')}}}diff --git a/settings/settings_global.py b/settings/settings_global.pyindex cae1ab5cc..37846b769 100644--- a/settings/settings_global.py+++ b/settings/settings_global.py@@ -406,7 +406,6 @@ THUMBNAIL_ALIASES = {},}-STATIC_ROOT = ''USE_S3 = os.getenv('USE_S3') == 'TRUE'if USE_S3: