diff --git a/Dockerfile b/Dockerfile index 58ca55d2..14e2335b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,4 +22,14 @@ RUN LIBRARY_PATH=/lib:/usr/lib /bin/sh -c "pip install --no-cache-dir -r require COPY ./ . COPY entrypoint.sh / +# Static files are collected at build time into /app/static (served by the hosting). +# The settings need these values to load; the real ones come at run time. +ENV STATIC_ROOT=/app/static +RUN CACHE_URL=locmem:// OPENNEBULA_DOMAIN=test_domain \ + OPENNEBULA_USERNAME=build OPENNEBULA_PASSWORD=build OPENNEBULA_PROTOCOL=http \ + OPENNEBULA_PORT=2633 OPENNEBULA_ENDPOINT=/RPC2 DJANGO_SECRET_KEY=build UNGLEICH_SITE_CONFIGS='{}' LDAP_CUSTOMER_GROUP_ID=0 \ + LDAP_DEFAULT_START_UID=0 PRE_EU_VAT_RATE=0 VM_BASE_PRICE=0 \ + RECAPTCHA_PUBLIC_KEY=build RECAPTCHA_PRIVATE_KEY=build \ + python manage.py collectstatic --noinput -v0 + ENTRYPOINT ["/entrypoint.sh" ] diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 47e9aefe..b26607bc 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -403,6 +403,8 @@ CACHES = { 'LOCATION': env('CACHE_URL', 'redis://redis:6379/1'), } } +if env('CACHE_URL') == 'locmem://': # image build: no Redis to talk to + CACHES['default'] = {'BACKEND': 'django.core.cache.backends.locmem.LocMemCache'} if LOGIN_URL is None: LOGIN_URL = APP_ROOT_ENDPOINT + 'login/' @@ -416,7 +418,7 @@ if LOGIN_REDIRECT_URL is None: STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(PROJECT_DIR, 'static') +STATIC_ROOT = env('STATIC_ROOT', os.path.join(PROJECT_DIR, 'static')) MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media') MEDIA_URL = APP_ROOT_ENDPOINT + 'media/'