1
0
Fork 0

Allow configuration of static and media root directories via environment variables

Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
environments/stage/deployments/64
Vasilis Tsiligiannis 2018-11-22 21:36:21 +02:00
parent 3883bf7e38
commit c99ac79487
2 changed files with 11 additions and 2 deletions

View File

@ -123,7 +123,7 @@ TEMPLATES = [
]
# Static & Media
STATIC_ROOT = Path('staticfiles').resolve()
STATIC_ROOT = config('STATIC_ROOT', default=Path('staticfiles').resolve())
STATIC_URL = '/static/'
STATICFILES_DIRS = [
Path(ROOT).child('static').resolve(),
@ -133,7 +133,7 @@ STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'compressor.finders.CompressorFinder',
)
MEDIA_ROOT = Path('media').resolve()
MEDIA_ROOT = config('MEDIA_ROOT', default=Path('media').resolve())
MEDIA_URL = '/media/'
CRISPY_TEMPLATE_PACK = 'bootstrap3'
SATELLITE_DEFAULT_IMAGE = '/static/img/sat.png'

View File

@ -21,9 +21,11 @@ services:
CELERY_BROKER_URL: 'redis://redis:6379/0'
CELERY_RESULT_BACKEND: 'redis://redis:6379/0'
CACHE_LOCATION: 'redis://redis:6379/1'
MEDIA_ROOT: '/var/lib/satnogs-db/media'
command: ["djangoctl.sh", "develop_celery", "/usr/local/src/satnogs-db"]
volumes:
- '.:/usr/local/src/satnogs-db:z'
- 'media:/var/lib/satnogs-db/media'
web:
build:
context: '.'
@ -39,6 +41,13 @@ services:
CELERY_BROKER_URL: 'redis://redis:6379/0'
CELERY_RESULT_BACKEND: 'redis://redis:6379/0'
CACHE_LOCATION: 'redis://redis:6379/1'
STATIC_ROOT: '/var/lib/satnogs-db/staticfiles'
MEDIA_ROOT: '/var/lib/satnogs-db/media'
command: ["djangoctl.sh", "develop", "/usr/local/src/satnogs-db"]
volumes:
- '.:/usr/local/src/satnogs-db:z'
- 'static:/var/lib/satnogs-db/static'
- 'media:/var/lib/satnogs-db/media'
volumes:
static:
media: